Rename all references to kde/HTML to tde/HTML in the Debian and Ubuntu packaging files

725 files changed, 3274 insertions, 3274 deletions

diff --git a/ubuntu/maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk
index 856fa4932..5e704aa4a 100644
--- a/ubuntu/maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/abakus/debian/cdbs/kde.mk b/ubuntu/maverick/applications/abakus/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/abakus/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/abakus/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/adept/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/adept/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/adept/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/adept/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk b/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
index 888f4be38..345cc0a61 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/kde.mk b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/changelog b/ubuntu/maverick/applications/amarok.cmake/debian/changelog
index c2bf1ae55..1d7f087f0 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/changelog
+++ b/ubuntu/maverick/applications/amarok.cmake/debian/changelog
@@ -1444,8 +1444,8 @@ amarok (1.1.1-1) unstable; urgency=low
 
 amarok (1.1.0-2) unstable; urgency=low
 
-  * Fix the location of translated amaroK handbook: kde/HTML/$LANG/amarok, not
-    kde/HTML/$LANG directly. [debian/patches/proper-otherlang-handbook-path.patch]
+  * Fix the location of translated amaroK handbook: tde/HTML/$LANG/amarok, not
+    tde/HTML/$LANG directly. [debian/patches/proper-otherlang-handbook-path.patch]
 
  -- Adeodato Simó <asp16@alu.ua.es>  Mon, 27 Sep 2004 14:02:30 +0200
 
diff --git a/ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk b/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/amarok/debian/changelog b/ubuntu/maverick/applications/amarok/debian/changelog
index c2bf1ae55..1d7f087f0 100644
--- a/ubuntu/maverick/applications/amarok/debian/changelog
+++ b/ubuntu/maverick/applications/amarok/debian/changelog
@@ -1444,8 +1444,8 @@ amarok (1.1.1-1) unstable; urgency=low
 
 amarok (1.1.0-2) unstable; urgency=low
 
-  * Fix the location of translated amaroK handbook: kde/HTML/$LANG/amarok, not
-    kde/HTML/$LANG directly. [debian/patches/proper-otherlang-handbook-path.patch]
+  * Fix the location of translated amaroK handbook: tde/HTML/$LANG/amarok, not
+    tde/HTML/$LANG directly. [debian/patches/proper-otherlang-handbook-path.patch]
 
  -- Adeodato Simó <asp16@alu.ua.es>  Mon, 27 Sep 2004 14:02:30 +0200
 
diff --git a/ubuntu/maverick/applications/basket/debian/basket-trinity.install b/ubuntu/maverick/applications/basket/debian/basket-trinity.install
index 2b7a2867b..a24d7e924 100644
--- a/ubuntu/maverick/applications/basket/debian/basket-trinity.install
+++ b/ubuntu/maverick/applications/basket/debian/basket-trinity.install
@@ -121,8 +121,8 @@ opt/trinity/share/locale/nn/LC_MESSAGES/basket.mo
 opt/trinity/share/locale/it/LC_MESSAGES/basket.mo
 opt/trinity/share/locale/nl/LC_MESSAGES/basket.mo
 opt/trinity/share/config/magic/basket.magic
-opt/trinity/share/doc/kde/HTML/en/basket/index.cache.bz2
-opt/trinity/share/doc/kde/HTML/en/basket/index.docbook
+opt/trinity/share/doc/tde/HTML/en/basket/index.cache.bz2
+opt/trinity/share/doc/tde/HTML/en/basket/index.docbook
 opt/trinity/bin/basket
 opt/trinity/lib/trinity/basketthumbcreator.la
 opt/trinity/lib/trinity/libbasketpart.so
diff --git a/ubuntu/maverick/applications/basket/debian/rules b/ubuntu/maverick/applications/basket/debian/rules
index 0e699603a..0527d1198 100755
--- a/ubuntu/maverick/applications/basket/debian/rules
+++ b/ubuntu/maverick/applications/basket/debian/rules
@@ -43,7 +43,7 @@ config.status: $(QUILT_STAMPFN)
 		--with-qt-libraries=/usr/share/qt3/lib \
 		--mandir=/opt/trinity/share/man \
 		--infodir=/opt/trinity/share/info \
-		--disable-debug kde_htmldir=/opt/trinity/share/doc/kde/HTML \
+		--disable-debug kde_htmldir=/opt/trinity/share/doc/tde/HTML \
 		--with-extra-libs=/opt/trinity/lib
 
 
diff --git a/ubuntu/maverick/applications/bibletime/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/bibletime/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/bibletime/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/bibletime/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk b/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk b/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk
index 888f4be38..345cc0a61 100644
--- a/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/dolphin/debian/cdbs/kde.mk b/ubuntu/maverick/applications/dolphin/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/dolphin/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/dolphin/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/filelight/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/filelight/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/filelight/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/filelight/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk b/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk b/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/gwenview/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/gwenview/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/gwenview/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/gwenview/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk b/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/gwenview/debian/gwenview.doc-base b/ubuntu/maverick/applications/gwenview/debian/gwenview.doc-base
index 1557d9d08..9efaff358 100644
--- a/ubuntu/maverick/applications/gwenview/debian/gwenview.doc-base
+++ b/ubuntu/maverick/applications/gwenview/debian/gwenview.doc-base
@@ -5,5 +5,5 @@ Abstract: Gwenview is an image viewer for KDE.
 Section: Viewers
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/gwenview/index.html
-Files: /usr/share/doc/kde/HTML/en/gwenview/*.html
+Index: /usr/share/doc/tde/HTML/en/gwenview/index.html
+Files: /usr/share/doc/tde/HTML/en/gwenview/*.html
diff --git a/ubuntu/maverick/applications/gwenview/debian/rules b/ubuntu/maverick/applications/gwenview/debian/rules
index 81fd87521..447938cef 100755
--- a/ubuntu/maverick/applications/gwenview/debian/rules
+++ b/ubuntu/maverick/applications/gwenview/debian/rules
@@ -37,5 +37,5 @@ install/gwenview-trinity::
 	install -p -D -m644 debian/gwenview.xpm debian/gwenview/opt/trinity/share/pixmaps/gwenview.xpm
 	install -p -D -m644 debian/gwenview.lintian debian/gwenview/opt/trinity/share/lintian/overrides/gwenview
 	
-	cd $(CURDIR)/debian/gwenview/opt/trinity/share/doc/kde/HTML/en/gwenview; \
-	/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/gwenview/index.docbook
+	cd $(CURDIR)/debian/gwenview/opt/trinity/share/doc/tde/HTML/en/gwenview; \
+	/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/gwenview/index.docbook
diff --git a/ubuntu/maverick/applications/k3b/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/k3b/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/k3b/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/k3b/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk b/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/k3b/debian/trinity.mk b/ubuntu/maverick/applications/k3b/debian/trinity.mk
index cd71193a1..17d35ae2c 100644
--- a/ubuntu/maverick/applications/k3b/debian/trinity.mk
+++ b/ubuntu/maverick/applications/k3b/debian/trinity.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/k9copy/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/k9copy/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/k9copy/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/k9copy/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk b/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/k9copy/debian/rules b/ubuntu/maverick/applications/k9copy/debian/rules
index 7f17e00f5..7a79ae048 100755
--- a/ubuntu/maverick/applications/k9copy/debian/rules
+++ b/ubuntu/maverick/applications/k9copy/debian/rules
@@ -29,7 +29,7 @@ debian/stamp-bootstrap:
 
 install/k9copy::
 	dh_install src/k9copy.desktop opt/trinity/share/applications/kde
-	dh_link usr/share/doc/kde/HTML/en/k9copy usr/share/doc/k9copy/html
+	dh_link usr/share/doc/tde/HTML/en/k9copy usr/share/doc/k9copy/html
 
 build/k9copy::
 	docbook2x-man debian/k9copy.1.docbook
diff --git a/ubuntu/maverick/applications/kaffeine/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kaffeine/debian/changelog b/ubuntu/maverick/applications/kaffeine/debian/changelog
index be405ad6c..2441c46c2 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/changelog
+++ b/ubuntu/maverick/applications/kaffeine/debian/changelog
@@ -152,7 +152,7 @@ kaffeine (0.8.4-2) unstable; urgency=low
 
   * Remove CMakeLists.txt
     - Problem during upgrade: trying to overwrite
-    `/usr/share/doc/kde/HTML/en/doc/CMakeLists.txt' (Closes: #419477)
+    `/usr/share/doc/tde/HTML/en/doc/CMakeLists.txt' (Closes: #419477)
 
  -- Mark Purcell <msp@debian.org>  Thu, 19 Apr 2007 05:50:00 +1000
 
@@ -772,7 +772,7 @@ kaffeine (0.4.2-1.1) unstable; urgency=low
 
   * NMU.
   * debian dir redone with permission of maintainer.
-  * Install docs into /usr/share/doc/kde/HTML. (Closes: #245062)
+  * Install docs into /usr/share/doc/tde/HTML. (Closes: #245062)
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu, 22 Apr 2004 00:30:00 -0500
 
diff --git a/ubuntu/maverick/applications/kaffeine/debian/rules b/ubuntu/maverick/applications/kaffeine/debian/rules
index 43e1e0d24..9dc73fe0f 100755
--- a/ubuntu/maverick/applications/kaffeine/debian/rules
+++ b/ubuntu/maverick/applications/kaffeine/debian/rules
@@ -44,7 +44,7 @@ install/kaffeine-trinity::
 	# file shipped by tdelibs
 	rm -f debian/kaffeine/opt/trinity/share/mimelnk/application/x-mplayer2.desktop
 	# Bogus, shouldn't be shipped..
-	rm -f debian/kaffeine/opt/trinity/share/doc/kde/HTML/en/doc/CMakeLists.txt
+	rm -f debian/kaffeine/opt/trinity/share/doc/tde/HTML/en/doc/CMakeLists.txt
 
 get-orig-source:
 	 @@dh_testdir
diff --git a/ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk b/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kbarcode/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kbookreader/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/additions/kchmviewer.1 b/ubuntu/maverick/applications/kchmviewer/debian/additions/kchmviewer.1
index f69e8544d..8598644e6 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/additions/kchmviewer.1
+++ b/ubuntu/maverick/applications/kchmviewer/debian/additions/kchmviewer.1
@@ -24,7 +24,7 @@ kchmviewer
 makes it possible to browse native Windows CHM files under KDE.
 .PP
 Complete documentation can be found in docbook format in
-/usr/share/doc/kde/HTML/<lang>/kchmviewer/ on this system.
+/usr/share/doc/tde/HTML/<lang>/kchmviewer/ on this system.
 .SH AUTHOR
  George Yunaev <gyunaev@ulduzsoft.com>
 .PP
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/debiandirs b/ubuntu/maverick/applications/kchmviewer/debian/debiandirs
index 893052e08..4ef41159b 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/debiandirs
+++ b/ubuntu/maverick/applications/kchmviewer/debian/debiandirs
@@ -6,4 +6,4 @@ export mandir=/usr/share/man
 export qtdir=/usr/share/qt3
 export kde_cgidir=/usr/lib/cgi-bin
 export kde_confdir=/etc/trinity
-export kde_htmldir=/usr/share/doc/kde/HTML
+export kde_htmldir=/usr/share/doc/tde/HTML
diff --git a/ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kcpuload/debian/changelog b/ubuntu/maverick/applications/kcpuload/debian/changelog
index a5b5f833f..44a891850 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/changelog
+++ b/ubuntu/maverick/applications/kcpuload/debian/changelog
@@ -242,7 +242,7 @@ kcpuload (1.90-1) unstable; urgency=low
   * Added a man page.
   * Added an icon in /usr/share/pixmaps/.
   * Moved HTML documentation from /usr/share/apps/kcpuload/docs/ to
-    /usr/share/doc/kde/HTML/en/kcpuload/ so that dwww can access it.
+    /usr/share/doc/tde/HTML/en/kcpuload/ so that dwww can access it.
 
  -- Ben Burton <benb@acm.org>  Wed, 21 Feb 2001 12:08:01 -0600
 
diff --git a/ubuntu/maverick/applications/kcpuload/debian/kcpuload.1 b/ubuntu/maverick/applications/kcpuload/debian/kcpuload.1
index 62ac5317a..0eb630559 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/kcpuload.1
+++ b/ubuntu/maverick/applications/kcpuload/debian/kcpuload.1
@@ -51,7 +51,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can
 read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kcpuload/\fP.
+\fI/usr/share/doc/tde/HTML/en/kcpuload/\fP.
 .SH AUTHOR
 KCPULoad was written by Markus Gustavsson <mighty@fragzone.se> and
 Ben Burton <bab@debian.org>
diff --git a/ubuntu/maverick/applications/kcpuload/debian/rules b/ubuntu/maverick/applications/kcpuload/debian/rules
index fae495f36..0e89a75fa 100755
--- a/ubuntu/maverick/applications/kcpuload/debian/rules
+++ b/ubuntu/maverick/applications/kcpuload/debian/rules
@@ -147,8 +147,8 @@ install: build
 
 	# Install standard documentation links.
 	for pkg in `dh_listpackages`; do \
-	  if test -d debian/$$pkg/opt/trinity/share/doc/kde/HTML/en/$$pkg; then \
-	    dh_link -p$$pkg opt/trinity/share/doc/kde/HTML/en/$$pkg \
+	  if test -d debian/$$pkg/opt/trinity/share/doc/tde/HTML/en/$$pkg; then \
+	    dh_link -p$$pkg opt/trinity/share/doc/tde/HTML/en/$$pkg \
 	      opt/trinity/share/doc/$$pkg/html; \
 	  fi; \
 	done
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/rules b/ubuntu/maverick/applications/kdbusnotification/debian/rules
index d47788b3a..2acd9ab0f 100755
--- a/ubuntu/maverick/applications/kdbusnotification/debian/rules
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/rules
@@ -146,8 +146,8 @@ install: build
 
 	# Install standard documentation links.
 	for pkg in `dh_listpackages`; do \
-	  if test -d debian/$$pkg/opt/trinity/share/doc/kde/HTML/en/$$pkg; then \
-	    dh_link -p$$pkg opt/trinity/share/doc/kde/HTML/en/$$pkg \
+	  if test -d debian/$$pkg/opt/trinity/share/doc/tde/HTML/en/$$pkg; then \
+	    dh_link -p$$pkg opt/trinity/share/doc/tde/HTML/en/$$pkg \
 	      opt/trinity/share/doc/$$pkg/html; \
 	  fi; \
 	done
diff --git a/ubuntu/maverick/applications/kdiff3/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity-doc.links b/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity-doc.links
index 46c236af4..e3fbe7781 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity-doc.links
+++ b/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity-doc.links
@@ -1,97 +1,97 @@
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/kde/HTML/da/kdiff3/dirbrowser.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/kde/HTML/da/kdiff3/dirmergebig.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/kde/HTML/da/kdiff3/iteminfo.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/kde/HTML/da/kdiff3/letter_by_letter.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/kde/HTML/da/kdiff3/merge_current.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/kde/HTML/da/kdiff3/new.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/kde/HTML/da/kdiff3/open_dialog.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/kde/HTML/da/kdiff3/screenshot_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/kde/HTML/da/kdiff3/screenshot_merge.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/kde/HTML/da/kdiff3/triple_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/kde/HTML/da/kdiff3/white_space.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/tde/HTML/da/kdiff3/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/tde/HTML/da/kdiff3/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/tde/HTML/da/kdiff3/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/tde/HTML/da/kdiff3/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/tde/HTML/da/kdiff3/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/tde/HTML/da/kdiff3/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/tde/HTML/da/kdiff3/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/tde/HTML/da/kdiff3/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/tde/HTML/da/kdiff3/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/tde/HTML/da/kdiff3/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/tde/HTML/da/kdiff3/white_space.png
 
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/kde/HTML/de/kdiff3/dirbrowser.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/kde/HTML/de/kdiff3/dirmergebig.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/kde/HTML/de/kdiff3/iteminfo.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/kde/HTML/de/kdiff3/letter_by_letter.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/kde/HTML/de/kdiff3/merge_current.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/kde/HTML/de/kdiff3/new.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/kde/HTML/de/kdiff3/open_dialog.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/kde/HTML/de/kdiff3/screenshot_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/kde/HTML/de/kdiff3/screenshot_merge.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/kde/HTML/de/kdiff3/triple_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/kde/HTML/de/kdiff3/white_space.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/tde/HTML/de/kdiff3/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/tde/HTML/de/kdiff3/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/tde/HTML/de/kdiff3/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/tde/HTML/de/kdiff3/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/tde/HTML/de/kdiff3/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/tde/HTML/de/kdiff3/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/tde/HTML/de/kdiff3/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/tde/HTML/de/kdiff3/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/tde/HTML/de/kdiff3/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/tde/HTML/de/kdiff3/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/tde/HTML/de/kdiff3/white_space.png
 
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/kde/HTML/et/kdiff3/dirbrowser.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/kde/HTML/et/kdiff3/dirmergebig.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/kde/HTML/et/kdiff3/iteminfo.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/kde/HTML/et/kdiff3/letter_by_letter.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/kde/HTML/et/kdiff3/merge_current.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/kde/HTML/et/kdiff3/new.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/kde/HTML/et/kdiff3/open_dialog.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/kde/HTML/et/kdiff3/screenshot_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/kde/HTML/et/kdiff3/screenshot_merge.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/kde/HTML/et/kdiff3/triple_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/kde/HTML/et/kdiff3/white_space.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/tde/HTML/et/kdiff3/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/tde/HTML/et/kdiff3/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/tde/HTML/et/kdiff3/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/tde/HTML/et/kdiff3/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/tde/HTML/et/kdiff3/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/tde/HTML/et/kdiff3/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/tde/HTML/et/kdiff3/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/tde/HTML/et/kdiff3/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/tde/HTML/et/kdiff3/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/tde/HTML/et/kdiff3/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/tde/HTML/et/kdiff3/white_space.png
 
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/kde/HTML/fr/kdiff3/dirbrowser.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/kde/HTML/fr/kdiff3/dirmergebig.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/kde/HTML/fr/kdiff3/iteminfo.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/kde/HTML/fr/kdiff3/letter_by_letter.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/kde/HTML/fr/kdiff3/merge_current.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/kde/HTML/fr/kdiff3/new.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/kde/HTML/fr/kdiff3/open_dialog.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/kde/HTML/fr/kdiff3/screenshot_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/kde/HTML/fr/kdiff3/screenshot_merge.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/kde/HTML/fr/kdiff3/triple_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/kde/HTML/fr/kdiff3/white_space.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/tde/HTML/fr/kdiff3/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/tde/HTML/fr/kdiff3/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/tde/HTML/fr/kdiff3/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/tde/HTML/fr/kdiff3/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/tde/HTML/fr/kdiff3/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/tde/HTML/fr/kdiff3/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/tde/HTML/fr/kdiff3/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/tde/HTML/fr/kdiff3/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/tde/HTML/fr/kdiff3/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/tde/HTML/fr/kdiff3/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/tde/HTML/fr/kdiff3/white_space.png
 
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/kde/HTML/it/kdiff3/dirbrowser.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/kde/HTML/it/kdiff3/dirmergebig.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/kde/HTML/it/kdiff3/iteminfo.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/kde/HTML/it/kdiff3/letter_by_letter.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/kde/HTML/it/kdiff3/merge_current.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/kde/HTML/it/kdiff3/new.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/kde/HTML/it/kdiff3/open_dialog.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/kde/HTML/it/kdiff3/screenshot_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/kde/HTML/it/kdiff3/screenshot_merge.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/kde/HTML/it/kdiff3/triple_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/kde/HTML/it/kdiff3/white_space.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/tde/HTML/it/kdiff3/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/tde/HTML/it/kdiff3/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/tde/HTML/it/kdiff3/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/tde/HTML/it/kdiff3/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/tde/HTML/it/kdiff3/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/tde/HTML/it/kdiff3/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/tde/HTML/it/kdiff3/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/tde/HTML/it/kdiff3/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/tde/HTML/it/kdiff3/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/tde/HTML/it/kdiff3/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/tde/HTML/it/kdiff3/white_space.png
 
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/kde/HTML/pt/kdiff3/dirbrowser.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/kde/HTML/pt/kdiff3/dirmergebig.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/kde/HTML/pt/kdiff3/iteminfo.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/kde/HTML/pt/kdiff3/letter_by_letter.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/kde/HTML/pt/kdiff3/merge_current.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/kde/HTML/pt/kdiff3/new.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/kde/HTML/pt/kdiff3/open_dialog.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/kde/HTML/pt/kdiff3/screenshot_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/kde/HTML/pt/kdiff3/screenshot_merge.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/kde/HTML/pt/kdiff3/triple_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/kde/HTML/pt/kdiff3/white_space.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/tde/HTML/pt/kdiff3/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/tde/HTML/pt/kdiff3/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/tde/HTML/pt/kdiff3/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/tde/HTML/pt/kdiff3/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/tde/HTML/pt/kdiff3/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/tde/HTML/pt/kdiff3/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/tde/HTML/pt/kdiff3/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/tde/HTML/pt/kdiff3/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/tde/HTML/pt/kdiff3/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/tde/HTML/pt/kdiff3/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/tde/HTML/pt/kdiff3/white_space.png
 
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/kde/HTML/sv/kdiff3/dirbrowser.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/kde/HTML/sv/kdiff3/dirmergebig.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/kde/HTML/sv/kdiff3/iteminfo.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/kde/HTML/sv/kdiff3/letter_by_letter.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/kde/HTML/sv/kdiff3/merge_current.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/kde/HTML/sv/kdiff3/new.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/kde/HTML/sv/kdiff3/open_dialog.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/kde/HTML/sv/kdiff3/screenshot_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/kde/HTML/sv/kdiff3/screenshot_merge.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/kde/HTML/sv/kdiff3/triple_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/kde/HTML/sv/kdiff3/white_space.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/tde/HTML/sv/kdiff3/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/tde/HTML/sv/kdiff3/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/tde/HTML/sv/kdiff3/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/tde/HTML/sv/kdiff3/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/tde/HTML/sv/kdiff3/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/tde/HTML/sv/kdiff3/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/tde/HTML/sv/kdiff3/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/tde/HTML/sv/kdiff3/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/tde/HTML/sv/kdiff3/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/tde/HTML/sv/kdiff3/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/tde/HTML/sv/kdiff3/white_space.png
 
 
-/opt/trinity/share/doc/kde/HTML/en/common						/opt/trinity/share/doc/kdiff3-doc/html/common
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/kdiff3-doc/html/dirbrowser.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/kdiff3-doc/html/dirmergebig.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/kdiff3-doc/html/iteminfo.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/kdiff3-doc/html/letter_by_letter.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/kdiff3-doc/html/merge_current.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/kdiff3-doc/html/new.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/kdiff3-doc/html/open_dialog.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/kdiff3-doc/html/screenshot_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/kdiff3-doc/html/screenshot_merge.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/kdiff3-doc/html/triple_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/kdiff3-doc/html/white_space.png
+/opt/trinity/share/doc/tde/HTML/en/common						/opt/trinity/share/doc/kdiff3-doc/html/common
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/kdiff3-doc/html/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/kdiff3-doc/html/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/kdiff3-doc/html/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/kdiff3-doc/html/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/kdiff3-doc/html/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/kdiff3-doc/html/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/kdiff3-doc/html/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/kdiff3-doc/html/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/kdiff3-doc/html/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/kdiff3-doc/html/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/kdiff3-doc/html/white_space.png
diff --git a/ubuntu/maverick/applications/kdiff3/debian/rules b/ubuntu/maverick/applications/kdiff3/debian/rules
index e76778235..ef9215c19 100755
--- a/ubuntu/maverick/applications/kdiff3/debian/rules
+++ b/ubuntu/maverick/applications/kdiff3/debian/rules
@@ -72,13 +72,13 @@ install: build
 	dh_installdirs
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \
-		kde_htmldir=/opt/trinity/share/doc/kde/HTML
-	rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/kde/HTML/kdiff3
+		kde_htmldir=/opt/trinity/share/doc/tde/HTML
+	rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/kdiff3
 	# that's not where we want to have a man page
-	rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdiff3/kdiff3.1
+	rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/kdiff3.1
 	# move HTML help /opt/trinity/share/doc/kdiff3/html/
 	mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
-	mv $(CURDIR)/debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdiff3/*.html $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
+	mv $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/*.html $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
 	# move kdiff3.desktop to freedesktop.org conforming place
 	mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/applications/kde/
 	mv $(CURDIR)/debian/tmp/opt/trinity/share/applnk/Development/kdiff3.desktop $(CURDIR)/debian/tmp/opt/trinity/share/applications/kde/
diff --git a/ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kdirstat/debian/changelog b/ubuntu/maverick/applications/kdirstat/debian/changelog
index 32917f933..e039356ea 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/changelog
+++ b/ubuntu/maverick/applications/kdirstat/debian/changelog
@@ -111,7 +111,7 @@ kdirstat (2.0.1-1) unstable; urgency=low
   * Added --disable-rpath to configure in rules.
   * Added check for noopt in DEBIAN_BUILD_OPTIONS in rules.
   * Changed doc/en/Makefile.in:95 to set kde_htmldir to
-    /share/doc/kde/HTML explicity. configure seems to pick up
+    /share/doc/tde/HTML explicity. configure seems to pick up
     /share/doc/HTML instead.
 
  -- Mike Schacht <mschacht@alumni.washington.edu>  Sat, 16 Nov 2002 17:56:14 -0600
diff --git a/ubuntu/maverick/applications/keep/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/keep/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/keep/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/keep/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk b/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk
index cae625265..d135c4257 100644
--- a/ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
index 856fa4932..5e704aa4a 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kile/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kile/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kile/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kile/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kile/debian/kile-trinity.install b/ubuntu/maverick/applications/kile/debian/kile-trinity.install
index 3dcddde6e..3d82db5d5 100644
--- a/ubuntu/maverick/applications/kile/debian/kile-trinity.install
+++ b/ubuntu/maverick/applications/kile/debian/kile-trinity.install
@@ -3,6 +3,6 @@ opt/trinity/bin/kile
 /opt/trinity/share/apps/kconf_update
 /opt/trinity/share/apps/kile
 /opt/trinity/share/config.kcfg/kile.kcfg
-/opt/trinity/share/doc/kde/HTML/en/kile
+/opt/trinity/share/doc/tde/HTML/en/kile
 /opt/trinity/share/icons
 /opt/trinity/share/mimelnk/text/x-kilepr.desktop
diff --git a/ubuntu/maverick/applications/kile/debian/kile-trinity.links b/ubuntu/maverick/applications/kile/debian/kile-trinity.links
index fddb46448..ebafda14f 100644
--- a/ubuntu/maverick/applications/kile/debian/kile-trinity.links
+++ b/ubuntu/maverick/applications/kile/debian/kile-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kile /opt/trinity/share/apps/kile/doc
+/opt/trinity/share/doc/tde/HTML/en/kile /opt/trinity/share/apps/kile/doc
diff --git a/ubuntu/maverick/applications/kile/debian/kile.1 b/ubuntu/maverick/applications/kile/debian/kile.1
index aecbc7a62..bbcde5836 100644
--- a/ubuntu/maverick/applications/kile/debian/kile.1
+++ b/ubuntu/maverick/applications/kile/debian/kile.1
@@ -54,7 +54,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can
 read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kile/\fP.
+\fI/usr/share/doc/tde/HTML/en/kile/\fP.
 .SH AUTHOR
 Kile was written by Pascal Brachet <pascal.brachet_at_club-internet.fr> and
 Jeroen Wijnhout <Jeroen.Wijnhout_at_kdemail.net> with contributions from
diff --git a/ubuntu/maverick/applications/kio-apt/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kio-apt/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kio-apt/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kio-apt/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kio-apt/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kio-apt/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kio-apt/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kio-apt/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kio-locate/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kio-locate/debian/cdbs/debian-qt-kde.mk
index 856fa4932..5e704aa4a 100644
--- a/ubuntu/maverick/applications/kio-locate/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kio-locate/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kio-locate/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kio-locate/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/kio-locate/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kio-locate/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kmatplot/debian/debianrules b/ubuntu/maverick/applications/kmatplot/debian/debianrules
index 7cfb17bd9..5976c6894 100644
--- a/ubuntu/maverick/applications/kmatplot/debian/debianrules
+++ b/ubuntu/maverick/applications/kmatplot/debian/debianrules
@@ -23,7 +23,7 @@ exit;
 
 $TQTDIR="/usr/share/tqt3";
 $tde_prefix="/opt/trinity";
-$tde_htmldir="$tde_prefix/share/doc/kde/HTML";
+$tde_htmldir="$tde_prefix/share/doc/tde/HTML";
 $tde_icondir="$tde_prefix/share/icons";
 $tde_sounddir="$tde_prefix/share/sounds";
 $tde_datadir="$tde_prefix/share/apps";
diff --git a/ubuntu/maverick/applications/kmplayer/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kmplayer/debian/changelog b/ubuntu/maverick/applications/kmplayer/debian/changelog
index 00d0559a0..26a6aed53 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/changelog
+++ b/ubuntu/maverick/applications/kmplayer/debian/changelog
@@ -19,7 +19,7 @@ kmplayer-trinity (1:0.10.0c-0ubuntu1) intrepid; urgency=low
 
 kmplayer (1:0.10.0c-0ubuntu3) hardy; urgency=low
 
-  * Drop /usr/share/doc/kde/HTML from kmplayer, as it's already in
+  * Drop /usr/share/doc/tde/HTML from kmplayer, as it's already in
     kmplayer-doc (LP: #210443).
 
  -- Colin Watson <cjwatson@ubuntu.com>  Tue, 15 Apr 2008 02:22:14 +0100
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/debiandirs b/ubuntu/maverick/applications/kmyfirewall/debian/debiandirs
index 8b51d74fa..289b430dc 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/debiandirs
+++ b/ubuntu/maverick/applications/kmyfirewall/debian/debiandirs
@@ -6,5 +6,5 @@ export mandir=/usr/share/man
 export qtdir=/usr/share/qt3
 export kde_cgidir=/usr/trinity/lib/cgi-bin
 export kde_confdir=/etc/trinity
-export kde_htmldir=/usr/share/doc/kde/HTML
+export kde_htmldir=/usr/share/doc/tde/HTML
 configkde=--disable-debug --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir)
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/dirs b/ubuntu/maverick/applications/kmyfirewall/debian/dirs
index d1b90caf8..48362f5e4 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/dirs
+++ b/ubuntu/maverick/applications/kmyfirewall/debian/dirs
@@ -1,2 +1,2 @@
 usr/trinity/bin
-usr/share/doc/kde/HTML/en
+usr/share/doc/tde/HTML/en
diff --git a/ubuntu/maverick/applications/kmymoney/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/knemo/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knemo/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/knemo/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/knemo/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/knetload/debian/changelog b/ubuntu/maverick/applications/knetload/debian/changelog
index d8577dc0d..d2a0d2a80 100644
--- a/ubuntu/maverick/applications/knetload/debian/changelog
+++ b/ubuntu/maverick/applications/knetload/debian/changelog
@@ -235,7 +235,7 @@ knetload (1.91-1) unstable; urgency=low
   * Added a man page.
   * Added an icon in /usr/share/pixmaps/.
   * Moved HTML documentation from /usr/share/apps/knetload/docs/ to
-    /usr/share/doc/kde/HTML/en/knetload/ so that dwww can access it.
+    /usr/share/doc/tde/HTML/en/knetload/ so that dwww can access it.
 
  -- Ben Burton <benb@acm.org>  Wed, 21 Feb 2001 12:08:16 -0600
 
diff --git a/ubuntu/maverick/applications/knetload/debian/knetload.1 b/ubuntu/maverick/applications/knetload/debian/knetload.1
index 389c46593..30b6c4e4d 100644
--- a/ubuntu/maverick/applications/knetload/debian/knetload.1
+++ b/ubuntu/maverick/applications/knetload/debian/knetload.1
@@ -50,7 +50,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can
 read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/knetload/\fP.
+\fI/usr/share/doc/tde/HTML/en/knetload/\fP.
 .SH AUTHOR
 KNetLoad was written by Flameeyes <dgp85@users.sourceforge.net>, 
 Markus Gustavsson <mighty@fragzone.se> and Ben Burton <bab@debian.org>.
diff --git a/ubuntu/maverick/applications/knetload/debian/rules b/ubuntu/maverick/applications/knetload/debian/rules
index 843a04ceb..c420d1160 100755
--- a/ubuntu/maverick/applications/knetload/debian/rules
+++ b/ubuntu/maverick/applications/knetload/debian/rules
@@ -148,8 +148,8 @@ install: build
 
 	# Install standard documentation links.
 	for pkg in `dh_listpackages`; do \
-	  if test -d debian/$$pkg/opt/trinity/share/doc/kde/HTML/en/$$pkg; then \
-	    dh_link -p$$pkg opt/trinity/share/doc/kde/HTML/en/$$pkg \
+	  if test -d debian/$$pkg/opt/trinity/share/doc/tde/HTML/en/$$pkg; then \
+	    dh_link -p$$pkg opt/trinity/share/doc/tde/HTML/en/$$pkg \
 	      opt/trinity/share/doc/$$pkg/html; \
 	  fi; \
 	done
diff --git a/ubuntu/maverick/applications/knetstats/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knetstats/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/knetstats/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/knetstats/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
index 888f4be38..345cc0a61 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/knights/debian/debiandirs b/ubuntu/maverick/applications/knights/debian/debiandirs
index ba70ea3fb..be2d7b174 100644
--- a/ubuntu/maverick/applications/knights/debian/debiandirs
+++ b/ubuntu/maverick/applications/knights/debian/debiandirs
@@ -6,5 +6,5 @@ export mandir=/usr/share/man
 export qtdir=/usr/share/qt3
 export kde_cgidir=/usr/lib/cgi-bin
 export kde_confdir=/etc/trinity
-export kde_htmldir=/usr/share/doc/kde/HTML
+export kde_htmldir=/usr/share/doc/tde/HTML
 configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir)
diff --git a/ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk
index d09854f82..53c516a66 100644
--- a/ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk b/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install b/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install
index e0960957d..a37b11ace 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install
@@ -36,267 +36,267 @@ debian/tmp/opt/trinity/share/apps/chalkplugins/substrate.rc
 debian/tmp/opt/trinity/share/apps/chalkplugins/wetplugin.rc
 debian/tmp/opt/trinity/share/apps/chalk/scripts
 debian/tmp/opt/trinity/share/apps/chalk/templates
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/commands-dialogs.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/commands.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/commands-menus.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/commands-palettes.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/commands-toolbars.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/createdocument.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/credits.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-autocontrast.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-blur.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-brightnesscontrast.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-bumpmap.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-coloradjustment.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-colortoalpha.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-colortransfer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-customconvolution.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-desaturate.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-edgebottom.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-edgeleft.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-edgeright.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-embossall.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-embosshorvert.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-embossvariable.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-gaussianblur.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-gaussiannoise.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-invert.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-lenscorrection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-maximizechannel.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-meanremoval.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-minimizechannel.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-oilpaint.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-pixelize.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-raindrops.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-randomnoise.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-randompick.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-roundcorners.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-sharpen.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-smalltiles.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-sobel.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-topedge.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-unsharpmask.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-waveletnoise.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-wave.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/developers.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/developers-plugins.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/developers-scripting.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-addpalette.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-blur.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-brightnesscontrast.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-bumpmap.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-coloradjustment.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-colorrange.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-colortoalpha.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-colortransfer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-colortransfer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-convertimagetype.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-convertlayertype.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-cubism.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-customconvolution.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-documentinformation.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-dropshadow.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-emboss.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-filtersgallery.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-gaussiannoise.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-histogram.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-imageproperties.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-imagerestoration.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-imagesize.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-layerproperties.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-layersize.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-lenscorrection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-newadjustmentlayer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-newlayer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-oilpaint.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-pixelize.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-raindrops.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-randomnoise.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-randompick.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-rotateimage.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-rotatelayer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-roundcorners.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-separateimage.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-shearimage.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-shearlayer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-smalltiles.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-sobel.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-substrate.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-unsharpmask.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-unsharpmask.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-waveletnoise.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-waveletnoise.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-wave.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/faq.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/installation.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/introduction.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mainscreen.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-burn.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-burn.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-color.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-darken.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-darken.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-divide.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-dodge.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-hue.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-hue.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-lighten.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-multiply.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-multiply.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-normal.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-original.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-overlay.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-saturation.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-screen.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-screen.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-value.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-value.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/newimage.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-colors-gray.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-colors-hsv.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-colors-palettes.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-colors-rgb.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-colors-watercolors.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-bezier.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-bezier.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-brush.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-colorpicker.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-contiguousfill.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-crop.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-duplicate.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-duplicate.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-ellipse.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-fill.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-gradient.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-histogram.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-line.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-overview.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-paintwithfilters.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-polygon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-polyline.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-rectangle.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-selectcontiguous.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-selectmagnetic.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-select.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-selectsimilar.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-star.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-text.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-transform.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-layers-layers.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-layers-scriptsmanager.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/preferences-color.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/preferences-display.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/preferences-general.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/preferences-grid.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/preferences-performance.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/preferences-sidebar.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/preferences-tablet.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/README.SCREENSHOTS
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/README.SCREENSHOTS
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/settings.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-brushesandstuff.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-brushes-brushshapes-autobrush.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-brushes-brushshapes-custombrush.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-brushes-brushshapes-predefined.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-brushes-gradients.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-brushes-patterns-custompattern.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-brushes-patterns.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-edit.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-file.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-chalk.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-navigation.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbars-button-zoomin.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbars-button-zoomin.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbars-button-zoomout.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-transformationtools.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-bezier-example2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-bezier-example3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-bezier-example.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-bezier-example.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-bezier.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-brush.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-colorpicker.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-contiguousfill.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-crop.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-duplicate.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-ellipse.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-eraseselection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-gradient.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-line.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-move.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-paintselection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-paintwithfilters-example.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-paintwithfilters.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-pan.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-perspectivegrid.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-perspectivetransform.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-perspectivetransform.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-polygon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-polyline.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-rectangle.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-selectbezier.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-selectcontiguous.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-selectelliptical.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-selectmagnetic.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-selectoutline.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-selectpolygonal.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-selectrectangular.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-selectsimilar.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-star.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-text.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-transform.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-zoom.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts10.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts11.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts12.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts4.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts5.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts6.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts7.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts8.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts9.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-10.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-11.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-12.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-13.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-4.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-5.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-6.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-7.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-8.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-9.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-sample.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-starting.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-tablet-1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-tablet-2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-tablet-3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-tablet.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-colorspaces.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-filters.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-images.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-layers.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-selections-1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-selections-2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-selections-3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-selections-4.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-selections-5.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-selections-6.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-selections.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-views.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/commands-dialogs.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/commands.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/commands-menus.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/commands-palettes.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/commands-toolbars.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/createdocument.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/credits.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-autocontrast.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-blur.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-brightnesscontrast.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-bumpmap.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-coloradjustment.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-colortoalpha.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-colortransfer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-customconvolution.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-desaturate.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-edgebottom.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-edgeleft.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-edgeright.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-embossall.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-embosshorvert.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-embossvariable.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-gaussianblur.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-gaussiannoise.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-invert.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-lenscorrection.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-maximizechannel.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-meanremoval.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-minimizechannel.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-oilpaint.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-pixelize.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-raindrops.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-randomnoise.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-randompick.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-roundcorners.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-sharpen.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-smalltiles.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-sobel.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-topedge.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-unsharpmask.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-waveletnoise.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-wave.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/developers.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/developers-plugins.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/developers-scripting.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-addpalette.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-blur.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-brightnesscontrast.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-bumpmap.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-coloradjustment.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-colorrange.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-colortoalpha.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-colortransfer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-colortransfer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-convertimagetype.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-convertlayertype.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-cubism.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-customconvolution.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-documentinformation.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-dropshadow.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-emboss.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-filtersgallery.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-gaussiannoise.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-histogram.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-imageproperties.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-imagerestoration.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-imagesize.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-layerproperties.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-layersize.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-lenscorrection.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-newadjustmentlayer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-newlayer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-oilpaint.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-pixelize.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-raindrops.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-randomnoise.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-randompick.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-rotateimage.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-rotatelayer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-roundcorners.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-separateimage.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-shearimage.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-shearlayer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-smalltiles.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-sobel.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-substrate.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-unsharpmask.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-unsharpmask.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-waveletnoise.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-waveletnoise.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-wave.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/faq.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/installation.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/introduction.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mainscreen.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-burn.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-burn.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-color.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-darken.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-darken.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-divide.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-dodge.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-hue.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-hue.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-lighten.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-multiply.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-multiply.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-normal.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-original.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-overlay.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-saturation.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-screen.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-screen.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-value.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-value.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/newimage.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-colors-gray.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-colors-hsv.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-colors-palettes.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-colors-rgb.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-colors-watercolors.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-bezier.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-bezier.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-brush.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-colorpicker.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-contiguousfill.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-crop.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-duplicate.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-duplicate.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-ellipse.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-fill.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-gradient.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-histogram.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-line.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-overview.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-paintwithfilters.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-polygon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-polyline.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-rectangle.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-selectcontiguous.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-selectmagnetic.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-select.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-selectsimilar.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-star.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-text.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-transform.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-layers-layers.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-layers-scriptsmanager.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/preferences-color.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/preferences-display.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/preferences-general.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/preferences-grid.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/preferences-performance.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/preferences-sidebar.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/preferences-tablet.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/README.SCREENSHOTS
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/README.SCREENSHOTS
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/settings.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-brushesandstuff.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-brushes-brushshapes-autobrush.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-brushes-brushshapes-custombrush.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-brushes-brushshapes-predefined.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-brushes-gradients.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-brushes-patterns-custompattern.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-brushes-patterns.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-edit.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-file.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-chalk.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-navigation.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbars-button-zoomin.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbars-button-zoomin.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbars-button-zoomout.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-transformationtools.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-bezier-example2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-bezier-example3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-bezier-example.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-bezier-example.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-bezier.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-brush.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-colorpicker.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-contiguousfill.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-crop.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-duplicate.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-ellipse.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-eraseselection.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-gradient.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-line.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-move.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-paintselection.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-paintwithfilters-example.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-paintwithfilters.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-pan.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-perspectivegrid.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-perspectivetransform.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-perspectivetransform.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-polygon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-polyline.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-rectangle.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-selectbezier.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-selectcontiguous.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-selectelliptical.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-selectmagnetic.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-selectoutline.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-selectpolygonal.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-selectrectangular.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-selectsimilar.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-star.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-text.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-transform.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-zoom.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts10.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts11.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts12.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts4.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts5.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts6.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts7.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts8.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts9.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-10.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-11.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-12.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-13.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-4.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-5.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-6.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-7.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-8.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-9.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-sample.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-starting.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-tablet-1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-tablet-2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-tablet-3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-tablet.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-colorspaces.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-filters.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-images.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-layers.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-selections-1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-selections-2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-selections-3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-selections-4.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-selections-5.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-selections-6.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-selections.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-views.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/chalk.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/chalk.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/chalk.png
diff --git a/ubuntu/maverick/applications/koffice/debian/control b/ubuntu/maverick/applications/koffice/debian/control
index 4aba97f07..e2147ded3 100644
--- a/ubuntu/maverick/applications/koffice/debian/control
+++ b/ubuntu/maverick/applications/koffice/debian/control
@@ -51,8 +51,8 @@ Description: KDE Office Suite documentation in HTML format [Trinity]
  format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /usr/share/doc/kde/HTML/<language>/<app>/, for instance
- /usr/share/doc/kde/HTML/en/kword/.
+ /usr/share/doc/tde/HTML/<language>/<app>/, for instance
+ /usr/share/doc/tde/HTML/en/kword/.
  .
  This package is part of the KDE Office Suite.
 
diff --git a/ubuntu/maverick/applications/koffice/debian/control.in b/ubuntu/maverick/applications/koffice/debian/control.in
index 6977987da..620c2dacb 100644
--- a/ubuntu/maverick/applications/koffice/debian/control.in
+++ b/ubuntu/maverick/applications/koffice/debian/control.in
@@ -45,8 +45,8 @@ Description: KDE Office Suite documentation in HTML format [Trinity]
  format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /usr/share/doc/kde/HTML/<language>/<app>/, for instance
- /usr/share/doc/kde/HTML/en/kword/.
+ /usr/share/doc/tde/HTML/<language>/<app>/, for instance
+ /usr/share/doc/tde/HTML/en/kword/.
  .
  This package is part of the KDE Office Suite.
 
diff --git a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.install b/ubuntu/maverick/applications/koffice/debian/karbon-trinity.install
index 653f730e0..a3649c378 100644
--- a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/karbon-trinity.install
@@ -49,9 +49,9 @@ debian/tmp/opt/trinity/lib/libtdeinit_karbon.so
 debian/tmp/opt/trinity/share/applications/kde/karbon.desktop
 debian/tmp/opt/trinity/share/apps/karbon
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/karbon_konqi.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/karbon/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/karbon/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/karbon/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/karbon/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/karbon/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/karbon/*.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/karbon.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/karbon.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/karbon.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.install b/ubuntu/maverick/applications/koffice/debian/kchart-trinity.install
index 443a6acbf..90c1a6824 100644
--- a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kchart-trinity.install
@@ -25,10 +25,10 @@ debian/tmp/opt/trinity/lib/libtdeinit_kchart.so
 debian/tmp/opt/trinity/share/applications/kde/kchart.desktop
 debian/tmp/opt/trinity/share/apps/kchart
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kchart_konqi.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kchart/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kchart/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kchart/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kchart/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kchart/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kchart/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kchart/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kchart/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kchart.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kchart.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kchart.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kchart.1 b/ubuntu/maverick/applications/koffice/debian/kchart.1
index 412727577..0b2c8a4c3 100644
--- a/ubuntu/maverick/applications/koffice/debian/kchart.1
+++ b/ubuntu/maverick/applications/koffice/debian/kchart.1
@@ -43,7 +43,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kchart/\fP.
+\fI/usr/share/doc/tde/HTML/en/kchart/\fP.
 .SH AUTHOR
 KChart was written by Kalle Dalheimer <kalle@kde.org>,
 Laurent Montel <lmontel@mandrakesoft.com>, Karl-Heinz Zimmer <khz@kde.org> and
diff --git a/ubuntu/maverick/applications/koffice/debian/kexi-trinity.install b/ubuntu/maverick/applications/koffice/debian/kexi-trinity.install
index a0b259950..3ff92c525 100644
--- a/ubuntu/maverick/applications/koffice/debian/kexi-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kexi-trinity.install
@@ -244,22 +244,22 @@ debian/tmp/opt/trinity/share/apps/kexi/scripts/importxhtml/ImportXHTML.rc
 debian/tmp/opt/trinity/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.py
 debian/tmp/opt/trinity/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.rc
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kexi_konqi.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/basics.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/building.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/comparing.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/configuration.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/contact-example.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/credits.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/database.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/designingforms.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/enteringdataintotables.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/enteringdatausingforms.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/intro.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/menus.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/querydesigning.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/basics.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/building.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/comparing.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/configuration.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/contact-example.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/credits.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/database.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/designingforms.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/enteringdataintotables.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/enteringdatausingforms.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/intro.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/menus.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/querydesigning.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kexiproject_sqlite2.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kexiproject_sqlite.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kexiproject_shortcut.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.install b/ubuntu/maverick/applications/koffice/debian/kformula-trinity.install
index 7c09d82a4..1339cfb67 100644
--- a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kformula-trinity.install
@@ -10,10 +10,10 @@ debian/tmp/opt/trinity/lib/libtdeinit_kformula.so
 debian/tmp/opt/trinity/share/applications/kde/kformula.desktop
 debian/tmp/opt/trinity/share/apps/kformula
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kformula_konqi.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kformula/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kformula/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kformula/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kformula/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kformula/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kformula/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kformula/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kformula/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kformula.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kformula.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kformula.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kformula.1 b/ubuntu/maverick/applications/koffice/debian/kformula.1
index 6f9dc87b6..801df0727 100644
--- a/ubuntu/maverick/applications/koffice/debian/kformula.1
+++ b/ubuntu/maverick/applications/koffice/debian/kformula.1
@@ -64,7 +64,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kformula/\fP.
+\fI/usr/share/doc/tde/HTML/en/kformula/\fP.
 .SH AUTHOR
 KFormula was written by Andrea Rizzi <rizzi@kde.org>,
 Stephan Kulow <coolo@kde.org>, Ulrich Kuettler <ulrich.kuettler@gmx.de>,
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.install b/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.install
index 020e92d24..02f3c0322 100644
--- a/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.install
@@ -3,9 +3,9 @@ debian/tmp/opt/trinity/share/applications/kde/kivio.desktop
 debian/tmp/opt/trinity/share/apps/kivio
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kivio_konqi.desktop
 debian/tmp/opt/trinity/share/config.kcfg/kivio.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kivio/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kivio/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kivio/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kivio/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kivio/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kivio/*.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kivio.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kivio.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kivio.png
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.install b/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.install
index 422bb81b2..2f17354e2 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.install
@@ -2,11 +2,11 @@ debian/tmp/opt/trinity/share/applications/kde/koffice.desktop
 debian/tmp/opt/trinity/share/apps/koffice
 debian/tmp/opt/trinity/share/apps/kofficewidgets
 debian/tmp/opt/trinity/share/apps/xsltfilter
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/koffice/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/koffice/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/koffice/CookBook.odt
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/koffice/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/koffice/TODO
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/koffice/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/koffice/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/koffice/CookBook.odt
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/koffice/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/koffice/TODO
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/abs.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/brackets.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/frac.png
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.links b/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.links
index 2767d3063..f85e205f2 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.links
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.links
@@ -1 +1 @@
-opt/trinity/share/doc/kde/HTML/en/koffice opt/trinity/share/doc/koffice-data/html
+opt/trinity/share/doc/tde/HTML/en/koffice opt/trinity/share/doc/koffice-data/html
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.links b/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.links
index 7a42a3655..b0df87ed7 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.links
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.links
@@ -1 +1 @@
-opt/trinity/share/doc/kde/HTML/en/koffice opt/trinity/share/doc/koffice-libs/html
+opt/trinity/share/doc/tde/HTML/en/koffice opt/trinity/share/doc/koffice-libs/html
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
index 73ebae1c4..bedc6cae9 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
@@ -7,6 +7,6 @@ Abstract: KChart is an application for drawing bar graphs, pie charts
 Section: Science/Mathematics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kchart/index.html
-Files: /usr/share/doc/kde/HTML/en/kchart/*.html
+Index: /usr/share/doc/tde/HTML/en/kchart/index.html
+Files: /usr/share/doc/tde/HTML/en/kchart/*.html
 
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
index 313188210..65271eda0 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
@@ -5,5 +5,5 @@ Abstract: KFormula is used to layout formulas.
 Section: Science/Mathematics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kformula/index.html
-Files: /usr/share/doc/kde/HTML/en/kformula/*.html
+Index: /usr/share/doc/tde/HTML/en/kformula/index.html
+Files: /usr/share/doc/tde/HTML/en/kformula/*.html
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
index ebee90002..0b6a7dbaa 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
@@ -5,6 +5,6 @@ Abstract: Kivio is the KOffice flowchart and diagram creation tool.
 Section: Office
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kivio/index.html
-Files: /usr/share/doc/kde/HTML/en/kivio/*.html
+Index: /usr/share/doc/tde/HTML/en/kivio/index.html
+Files: /usr/share/doc/tde/HTML/en/kivio/*.html
 
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
index b14560532..f6b06085b 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
@@ -6,6 +6,6 @@ Abstract: KOffice is an integrated office suite for the K Desktop
 Section: Office
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/koffice/index.html
-Files: /usr/share/doc/kde/HTML/en/koffice/*.html
+Index: /usr/share/doc/tde/HTML/en/koffice/index.html
+Files: /usr/share/doc/tde/HTML/en/koffice/*.html
 
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
index 6fe07417b..561d95388 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
@@ -6,5 +6,5 @@ Abstract: KPresenter is the presentations program in the KOffice suite of
 Section: Office
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kpresenter/index.html
-Files: /usr/share/doc/kde/HTML/en/kpresenter/*.html
+Index: /usr/share/doc/tde/HTML/en/kpresenter/index.html
+Files: /usr/share/doc/tde/HTML/en/kpresenter/*.html
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
index 5c93daab5..1e5b4ef84 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
@@ -5,5 +5,5 @@ Abstract: KSpread is a full featured spreadsheet program.
 Section: Science/Mathematics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kspread/index.html
-Files: /usr/share/doc/kde/HTML/en/kspread/*.html
+Index: /usr/share/doc/tde/HTML/en/kspread/index.html
+Files: /usr/share/doc/tde/HTML/en/kspread/*.html
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
index ef1a05cd8..4d4e5727b 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
@@ -7,6 +7,6 @@ Abstract: Kugar is a template-based XML report engine.  Kugar Report
 Section: Office
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kugar/index.html
-Files: /usr/share/doc/kde/HTML/en/kugar/*.html
+Index: /usr/share/doc/tde/HTML/en/kugar/index.html
+Files: /usr/share/doc/tde/HTML/en/kugar/*.html
 
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword
index d68ad856d..09953babd 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword
@@ -6,6 +6,6 @@ Abstract: KWord is a complete word-processing and simple desktop
 Section: Office
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kword/index.html
-Files: /usr/share/doc/kde/HTML/en/kword/*.html
+Index: /usr/share/doc/tde/HTML/en/kword/index.html
+Files: /usr/share/doc/tde/HTML/en/kword/*.html
 
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
index 0eaa05928..9e168a19f 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
@@ -7,6 +7,6 @@ Abstract: KThesaurus lists words related to a search term and offers a
 Section: Office
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/thesaurus/index.html
-Files: /usr/share/doc/kde/HTML/en/thesaurus/*.html
+Index: /usr/share/doc/tde/HTML/en/thesaurus/index.html
+Files: /usr/share/doc/tde/HTML/en/thesaurus/*.html
 
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc.install b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc.install
index 5103d1ea6..a3aaf470b 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc.install
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc.install
@@ -1 +1 @@
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/koffice-apidocs/*	/opt/trinity/share/doc/kde/HTML/en/koffice-apidocs
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/koffice-apidocs/*	/opt/trinity/share/doc/tde/HTML/en/koffice-apidocs
diff --git a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.install b/ubuntu/maverick/applications/koffice/debian/koshell-trinity.install
index c0399020b..165f4a36c 100644
--- a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/koshell-trinity.install
@@ -6,10 +6,10 @@ debian/tmp/opt/trinity/lib/libtdeinit_koshell.so
 debian/tmp/opt/trinity/share/applications/kde/koshell.desktop
 debian/tmp/opt/trinity/share/apps/koshell/koshellui.rc
 debian/tmp/opt/trinity/share/config.kcfg/koshell.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/koshell/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/koshell/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/koshell/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/koshell/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/koshell/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/koshell/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/koshell/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/koshell/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/koshell.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/koshell.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/koshell.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install b/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install
index d9667f9c6..ba215cc43 100644
--- a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install
@@ -30,32 +30,32 @@ debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/.directory
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/Plain.desktop
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/.source/8HourDay-40HourWeek.kplatot
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/.source/Plain.kplatot
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/commands.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/configure1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/configure2.1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/configure2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/configure-wbs.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/definitions.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/edit-accounts1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/edit-accounts.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/edit-calendar1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/edit-calendar2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/edit-calendar.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/edit-resources1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/edit-resources.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/edit-worktime.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/mainwindow1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/mainwindow.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/options.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/project-settings.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/wbs1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/wbs2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/wbs3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/wbs.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/wbs.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/commands.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/configure1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/configure2.1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/configure2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/configure-wbs.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/definitions.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/edit-accounts1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/edit-accounts.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/edit-calendar1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/edit-calendar2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/edit-calendar.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/edit-resources1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/edit-resources.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/edit-worktime.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/mainwindow1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/mainwindow.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/options.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/project-settings.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/wbs1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/wbs2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/wbs3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/wbs.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/wbs.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kplato.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kplato.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kplato.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter-data-trinity.install b/ubuntu/maverick/applications/koffice/debian/kpresenter-data-trinity.install
index de1c92750..3322113fc 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter-data-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kpresenter-data-trinity.install
@@ -2,10 +2,10 @@ debian/kpresenter.xpm opt/trinity/share/pixmaps
 debian/tmp/opt/trinity/share/applications/kde/kpresenter.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kpresenter_konqi.desktop
 debian/tmp/opt/trinity/share/apps/kpresenter
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpresenter/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpresenter/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpresenter/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpresenter/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpresenter/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpresenter/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpresenter/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpresenter/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kpresenter.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kpresenter.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kpresenter.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter.1 b/ubuntu/maverick/applications/koffice/debian/kpresenter.1
index 2fdde662c..7eb96d7f2 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter.1
+++ b/ubuntu/maverick/applications/koffice/debian/kpresenter.1
@@ -44,7 +44,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kpresenter/\fP.
+\fI/usr/share/doc/tde/HTML/en/kpresenter/\fP.
 .SH AUTHOR
 KPresenter was written by Reginald Stadlbauer <reggie@kde.org>,
 Werner Trobin <trobin@kde.org>, David Faure <dfaure@kde.org>,
diff --git a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.install b/ubuntu/maverick/applications/koffice/debian/kspread-trinity.install
index 6a7228fd3..5988b97be 100644
--- a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kspread-trinity.install
@@ -41,10 +41,10 @@ debian/tmp/opt/trinity/lib/libkspreadcommon.so.*
 debian/tmp/opt/trinity/share/applications/kde/kspread.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kspread_konqi.desktop
 debian/tmp/opt/trinity/share/apps/kspread
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kspread/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kspread/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kspread/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kspread/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspread/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspread/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspread/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspread/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kspread.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kspread.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kspread.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kspread.1 b/ubuntu/maverick/applications/koffice/debian/kspread.1
index 4dd1bb8a0..3ae324559 100644
--- a/ubuntu/maverick/applications/koffice/debian/kspread.1
+++ b/ubuntu/maverick/applications/koffice/debian/kspread.1
@@ -46,7 +46,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kspread/\fP.
+\fI/usr/share/doc/tde/HTML/en/kspread/\fP.
 .SH AUTHOR
 KSpread was written by Torben Weis <weis@kde.org>, Laurent Montel
 <montell@club-internet.fr>, David Faure <faure@kde.org> and many others.
diff --git a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.install b/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.install
index d0e29dd5c..1ce19b21c 100644
--- a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.install
@@ -5,8 +5,8 @@ debian/tmp/opt/trinity/lib/trinity/libthesaurustool.so
 debian/tmp/opt/trinity/lib/libtdeinit_kthesaurus.so
 debian/tmp/opt/trinity/share/applnk/Office/KThesaurus.desktop
 debian/tmp/opt/trinity/share/apps/thesaurus
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/thesaurus/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/thesaurus/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/thesaurus/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/*.docbook
 debian/tmp/opt/trinity/share/services/thesaurustool.desktop
 debian/kthesaurus.xpm opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/applications/koffice/debian/kthesaurus.1 b/ubuntu/maverick/applications/koffice/debian/kthesaurus.1
index ec74f549b..f5fba2153 100644
--- a/ubuntu/maverick/applications/koffice/debian/kthesaurus.1
+++ b/ubuntu/maverick/applications/koffice/debian/kthesaurus.1
@@ -44,7 +44,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/thesaurus/\fP.
+\fI/usr/share/doc/tde/HTML/en/thesaurus/\fP.
 .SH AUTHOR
 KThesaurus was written by Daniel Naber <daniel.naber@t-online.de>.
 .br
diff --git a/ubuntu/maverick/applications/koffice/debian/kudesigner.1 b/ubuntu/maverick/applications/koffice/debian/kudesigner.1
index 5b65e0431..b293d0016 100644
--- a/ubuntu/maverick/applications/koffice/debian/kudesigner.1
+++ b/ubuntu/maverick/applications/koffice/debian/kudesigner.1
@@ -47,7 +47,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kugar/\fP.
+\fI/usr/share/doc/tde/HTML/en/kugar/\fP.
 .SH AUTHOR
 KuDesigner was written by Alexander Dymo <cloudtemple@mksat.net> and
 Joseph Wenninger <jowenn@jowenn.at>.
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.install b/ubuntu/maverick/applications/koffice/debian/kugar-trinity.install
index c12230725..8dd8860bb 100644
--- a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kugar-trinity.install
@@ -20,10 +20,10 @@ debian/tmp/opt/trinity/share/applications/kde/kudesigner.desktop
 debian/tmp/opt/trinity/share/applications/kde/kugar.desktop
 debian/tmp/opt/trinity/share/apps/kudesigner
 debian/tmp/opt/trinity/share/apps/kugar
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kugar/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kugar/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kugar/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kugar/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kugar/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kugar/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kugar/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kugar/*.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kugardata.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kugardata.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kugar.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar.1 b/ubuntu/maverick/applications/koffice/debian/kugar.1
index af62a90fc..c3903a3d1 100644
--- a/ubuntu/maverick/applications/koffice/debian/kugar.1
+++ b/ubuntu/maverick/applications/koffice/debian/kugar.1
@@ -59,7 +59,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kugar/\fP.
+\fI/usr/share/doc/tde/HTML/en/kugar/\fP.
 .SH AUTHOR
 Kugar was written by Keith Davis (Mutiny Bay Software)
 <info@mutinybaysoftware.com>, Phil Thompson <phil@river-bank.demon.co.uk>,
diff --git a/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.install b/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.install
index 4d2ff77a9..32f9e2f9c 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.install
@@ -2,10 +2,10 @@ debian/kword.xpm opt/trinity/share/pixmaps
 debian/tmp/opt/trinity/share/applications/kde/kword.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kword_konqi.desktop
 debian/tmp/opt/trinity/share/apps/kword
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kword/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kword/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kword/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kword/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kword/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kword/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kword/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kword/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kword.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kword.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kword.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kword.1 b/ubuntu/maverick/applications/koffice/debian/kword.1
index 36be4f244..c191e2978 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword.1
+++ b/ubuntu/maverick/applications/koffice/debian/kword.1
@@ -48,7 +48,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kword/\fP.
+\fI/usr/share/doc/tde/HTML/en/kword/\fP.
 .SH AUTHOR
 KWord was written by Reginald Stadlbauer <reggie@kde.org>, Torben Weis
 <weis@kde.org>, David Faure <dfaure@kde.org>, Thomas Zander
diff --git a/ubuntu/maverick/applications/koffice/debian/rules b/ubuntu/maverick/applications/koffice/debian/rules
index 0c94bbdc9..6493acaff 100755
--- a/ubuntu/maverick/applications/koffice/debian/rules
+++ b/ubuntu/maverick/applications/koffice/debian/rules
@@ -36,8 +36,8 @@ install/chalk-data-trinity::
 
 common-binary-post-install-arch::
 	for pkg in `dh_listpackages`; do \
-		if test -d debian/$$pkg/usr/share/doc/kde/HTML/en/$$pkg; then \
-		dh_link -p$$pkg usr/share/doc/kde/HTML/en/$$pkg \
+		if test -d debian/$$pkg/usr/share/doc/tde/HTML/en/$$pkg; then \
+		dh_link -p$$pkg usr/share/doc/tde/HTML/en/$$pkg \
 		usr/share/doc/$$pkg/html; \
 		fi; \
 		dh_installmime -p$$pkg; \
diff --git a/ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk b/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/konversation/debian/konversation-trinity.install b/ubuntu/maverick/applications/konversation/debian/konversation-trinity.install
index 346ca42aa..ca10af6cf 100644
--- a/ubuntu/maverick/applications/konversation/debian/konversation-trinity.install
+++ b/ubuntu/maverick/applications/konversation/debian/konversation-trinity.install
@@ -6,14 +6,14 @@ debian/tmp/opt/trinity/share/apps/konversation/konversationui.rc
 debian/tmp/opt/trinity/share/apps/konversation/scripts/*
 debian/tmp/opt/trinity/share/apps/konversation/themes/*
 debian/tmp/opt/trinity/share/config.kcfg/konversation.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/da/konversation/*
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konversation/*
-debian/tmp/opt/trinity/share/doc/kde/HTML/es/konversation/*
-debian/tmp/opt/trinity/share/doc/kde/HTML/et/konversation/*
-debian/tmp/opt/trinity/share/doc/kde/HTML/it/konversation/*
-debian/tmp/opt/trinity/share/doc/kde/HTML/pt/konversation/*
-debian/tmp/opt/trinity/share/doc/kde/HTML/ru/konversation/*
-debian/tmp/opt/trinity/share/doc/kde/HTML/sv/konversation/*
+debian/tmp/opt/trinity/share/doc/tde/HTML/da/konversation/*
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konversation/*
+debian/tmp/opt/trinity/share/doc/tde/HTML/es/konversation/*
+debian/tmp/opt/trinity/share/doc/tde/HTML/et/konversation/*
+debian/tmp/opt/trinity/share/doc/tde/HTML/it/konversation/*
+debian/tmp/opt/trinity/share/doc/tde/HTML/pt/konversation/*
+debian/tmp/opt/trinity/share/doc/tde/HTML/ru/konversation/*
+debian/tmp/opt/trinity/share/doc/tde/HTML/sv/konversation/*
 debian/tmp/opt/trinity/share/icons/*
 debian/tmp/opt/trinity/share/locale/*
 debian/tmp/opt/trinity/share/services/konvirc.protocol
diff --git a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kpicosim/debian/kpicosim-trinity.links b/ubuntu/maverick/applications/kpicosim/debian/kpicosim-trinity.links
index e80a6f57c..78a8ee9df 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/kpicosim-trinity.links
+++ b/ubuntu/maverick/applications/kpicosim/debian/kpicosim-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kpicosim /opt/trinity/share/apps/kpicosim/doc
+/opt/trinity/share/doc/tde/HTML/en/kpicosim /opt/trinity/share/apps/kpicosim/doc
diff --git a/ubuntu/maverick/applications/kpicosim/debian/rules b/ubuntu/maverick/applications/kpicosim/debian/rules
index 8d66d9609..4f9b2c73a 100755
--- a/ubuntu/maverick/applications/kpicosim/debian/rules
+++ b/ubuntu/maverick/applications/kpicosim/debian/rules
@@ -94,8 +94,8 @@ install: build
 	 fi; \
 	 mv debian/$$pkg/opt/trinity/share/doc/HTML debian/$$pkg/opt/trinity/share/doc/kde/; \
 	 fi; \
-	 if test -d debian/$$pkg/opt/trinity/share/doc/kde/HTML/en/$$pkg; then \
-	 dh_link -p$$pkg opt/trinity/share/doc/kde/HTML/en/$$pkg \
+	 if test -d debian/$$pkg/opt/trinity/share/doc/tde/HTML/en/$$pkg; then \
+	 dh_link -p$$pkg opt/trinity/share/doc/tde/HTML/en/$$pkg \
 	 opt/trinity/share/doc/$$pkg/html; \
 	 fi; \
 	done
diff --git a/ubuntu/maverick/applications/kpilot/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kpilot/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kpilot/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kpilot/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
index 888f4be38..345cc0a61 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kradio/debian/rules b/ubuntu/maverick/applications/kradio/debian/rules
index 4ec00e4dc..775c1387d 100755
--- a/ubuntu/maverick/applications/kradio/debian/rules
+++ b/ubuntu/maverick/applications/kradio/debian/rules
@@ -48,7 +48,7 @@ config.status: configure
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
 		--disable-rpath --disable-debug \
-		kde_htmldir=/usr/share/doc/kde/HTML
+		kde_htmldir=/usr/share/doc/tde/HTML
 															
 
 
diff --git a/ubuntu/maverick/applications/krusader/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/krusader/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/krusader/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/krusader/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk b/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/debiandirs b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/debiandirs
index 58237d430..28fef39be 100644
--- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/debiandirs
+++ b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/debiandirs
@@ -6,5 +6,5 @@ export mandir=/opt/trinity/share/man
 export qtdir=/opt/trinity/share/qt3
 export kde_cgidir=/opt/trinity/lib/cgi-bin
 export kde_confdir=/etc/trinity
-export kde_htmldir=/opt/trinity/share/doc/kde/HTML
+export kde_htmldir=/opt/trinity/share/doc/tde/HTML
 configkde=--with-extra-libs=/opt/trinity/lib --disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir) 
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk b/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/ktechlab/debian/debiandirs b/ubuntu/maverick/applications/ktechlab/debian/debiandirs
index dfe8aa8ab..f2d481ccf 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/debiandirs
+++ b/ubuntu/maverick/applications/ktechlab/debian/debiandirs
@@ -7,7 +7,7 @@ export kde_cgidir=/opt/trinity/lib/cgi-bin
 export kde_moduledir=/opt/trinity/lib/trinity
 export kde_appsdir=/opt/trinity/share/applnk
 export kde_datadir=/opt/trinity/share/apps
-export kde_htmldir=/opt/trinity/share/doc/kde/HTML
+export kde_htmldir=/opt/trinity/share/doc/tde/HTML
 export kde_icondir=/opt/trinity/share/icons
 export kde_locale=/opt/trinity/share/locale
 export kde_mimedir=/opt/trinity/share/mimelnk
diff --git a/ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
index d09854f82..53c516a66 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk b/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kuickshow/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kvkbd/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kvkbd/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kvkbd/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kvpnc/debian/rules b/ubuntu/maverick/applications/kvpnc/debian/rules
index 00d853fcc..22a49ef44 100755
--- a/ubuntu/maverick/applications/kvpnc/debian/rules
+++ b/ubuntu/maverick/applications/kvpnc/debian/rules
@@ -28,7 +28,7 @@ install/kvpnc-trinity::
 	chmod 0755 debian/kvpnc-trinity/opt/trinity/share/apps/kvpnc/ping_check.sh
 
 	# remove uneeded dir
-	rm -rf debian/kvpnc-trinity/opt/trinity/share/doc/kde/HTML/kvpnc
+	rm -rf debian/kvpnc-trinity/opt/trinity/share/doc/tde/HTML/kvpnc
 
 	# install desktop file in applications
 	install -D -p -m0644 src/kvpnc.desktop \
diff --git a/ubuntu/maverick/applications/potracegui/debian/rules b/ubuntu/maverick/applications/potracegui/debian/rules
index 6be58cd48..e3b2d82e6 100755
--- a/ubuntu/maverick/applications/potracegui/debian/rules
+++ b/ubuntu/maverick/applications/potracegui/debian/rules
@@ -78,7 +78,7 @@ install: build
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/potracegui-trinity
 	mkdir -p $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/kde
-	mv $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/HTML $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/kde/HTML
+	mv $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/HTML $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/tde/HTML
 	mkdir -p $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/applnk/Graphics
 	mv $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/applnk/Utilities/potracegui.desktop $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/applnk/Graphics/
 	rmdir $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/applnk/Utilities
diff --git a/ubuntu/maverick/applications/rosegarden/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
index 856fa4932..5e704aa4a 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/rosegarden/debian/cdbs/kde.mk b/ubuntu/maverick/applications/rosegarden/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/rosegarden/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/rosegarden/debian/changelog b/ubuntu/maverick/applications/rosegarden/debian/changelog
index da6daabcb..a44c404be 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/changelog
+++ b/ubuntu/maverick/applications/rosegarden/debian/changelog
@@ -33,7 +33,7 @@ rosegarden (1:1.7.0-1ubuntu2) intrepid; urgency=low
 rosegarden (1:1.7.0-1ubuntu1) intrepid; urgency=low
 
   * Merge from Debian unstable. (LP: #225849) Remaining Ubuntu changes:
-    - Add usr/share/doc/kde/HTML to rosegarden-data, to provide online
+    - Add usr/share/doc/tde/HTML to rosegarden-data, to provide online
       help documentation.
     - Change fftw3-dev to libfftw3-dev.
     - Update maintainer field as per spec.
@@ -62,7 +62,7 @@ rosegarden (1:1.6.1-2) unstable; urgency=low
 rosegarden (1:1.6.1-1ubuntu1) hardy; urgency=low
 
   * Merge from debian unstable, remaining changes:
-    - Add usr/share/doc/kde/HTML to rosegarden-data, to provide online
+    - Add usr/share/doc/tde/HTML to rosegarden-data, to provide online
       help documentation.
     - Change fftw3-dev to libfftw3-dev.
     - Update maintainer field as per spec.
@@ -88,7 +88,7 @@ rosegarden (1:1.6.0-1ubuntu2) hardy; urgency=low
 rosegarden (1:1.6.0-1ubuntu1) hardy; urgency=low
 
   * Merge from Debian unstable, remaining changes:
-    Add usr/share/doc/kde/HTML to rosegarden-data, to provide online
+    Add usr/share/doc/tde/HTML to rosegarden-data, to provide online
     help documentation.
     debian/control:
     + Update maintainer field.   
@@ -109,7 +109,7 @@ rosegarden (1:1.6.0-1) unstable; urgency=low
 rosegarden (1:1.5.1-3ubuntu1) gutsy; urgency=low
 
   * Merge from Debian unstable, remaining changes:
-    - Add usr/share/doc/kde/HTML/ to rosegarden-data, to provide online
+    - Add usr/share/doc/tde/HTML/ to rosegarden-data, to provide online
       help documentation.
     - Update maintainer field in debian/control.
 
@@ -129,7 +129,7 @@ rosegarden (1:1.5.1-3) unstable; urgency=low
 rosegarden (1:1.5.1-2ubuntu1) gutsy; urgency=low
 
   * Merge from Debian unstable. Remaining Ubuntu changes:
-    - Add usr/share/doc/kde/HTML/ to rosegarden-data, to provide online
+    - Add usr/share/doc/tde/HTML/ to rosegarden-data, to provide online
       help documentation.
     - Changed maintainer field to MOTU.
 
@@ -178,7 +178,7 @@ rosegarden (1:1.5.0-1) unstable; urgency=low
 
 rosegarden (1:1.4.0-1ubuntu1) feisty; urgency=low
 
-  * Add usr/share/doc/kde/HTML/ to rosegarden-data, to provide online
+  * Add usr/share/doc/tde/HTML/ to rosegarden-data, to provide online
     help documentation. (Closes LP: #77079)
   * Changed maintainer field to MOTU.
 
diff --git a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-data-trinity.install b/ubuntu/maverick/applications/rosegarden/debian/rosegarden-data-trinity.install
index d066a2d8f..59a4a5943 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-data-trinity.install
+++ b/ubuntu/maverick/applications/rosegarden/debian/rosegarden-data-trinity.install
@@ -1,4 +1,4 @@
 debian/tmp/opt/trinity/share/apps
 debian/tmp/opt/trinity/share/icons
 debian/tmp/opt/trinity/share/locale
-debian/tmp/opt/trinity/share/doc/kde/HTML/
+debian/tmp/opt/trinity/share/doc/tde/HTML/
diff --git a/ubuntu/maverick/applications/smb4k/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/smb4k/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/smb4k/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/smb4k/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk b/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk b/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install
index de46528da..7064c79c0 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install
+++ b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install
@@ -14,19 +14,19 @@ opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png
 opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
 opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png
 opt/trinity/share/icons/crystalsvg/32x32/apps/wineconfig.png
-opt/trinity/share/doc/kde/HTML/en/guidance/index.cache.bz2
-opt/trinity/share/doc/kde/HTML/en/guidance/index.html
-opt/trinity/share/doc/kde/HTML/en/guidance/introduction.html
-opt/trinity/share/doc/kde/HTML/en/guidance/using-testapp.html
-opt/trinity/share/doc/kde/HTML/en/guidance/commands.html
-opt/trinity/share/doc/kde/HTML/en/guidance/developers.html
-opt/trinity/share/doc/kde/HTML/en/guidance/re-1007-unmanagechildren-1.html
-opt/trinity/share/doc/kde/HTML/en/guidance/faq.html
-opt/trinity/share/doc/kde/HTML/en/guidance/credits.html
-opt/trinity/share/doc/kde/HTML/en/guidance/installation.html
-opt/trinity/share/doc/kde/HTML/en/guidance/requirements.html
-opt/trinity/share/doc/kde/HTML/en/guidance/compilation.html
-opt/trinity/share/doc/kde/HTML/en/guidance/configuration.html
+opt/trinity/share/doc/tde/HTML/en/guidance/index.cache.bz2
+opt/trinity/share/doc/tde/HTML/en/guidance/index.html
+opt/trinity/share/doc/tde/HTML/en/guidance/introduction.html
+opt/trinity/share/doc/tde/HTML/en/guidance/using-testapp.html
+opt/trinity/share/doc/tde/HTML/en/guidance/commands.html
+opt/trinity/share/doc/tde/HTML/en/guidance/developers.html
+opt/trinity/share/doc/tde/HTML/en/guidance/re-1007-unmanagechildren-1.html
+opt/trinity/share/doc/tde/HTML/en/guidance/faq.html
+opt/trinity/share/doc/tde/HTML/en/guidance/credits.html
+opt/trinity/share/doc/tde/HTML/en/guidance/installation.html
+opt/trinity/share/doc/tde/HTML/en/guidance/requirements.html
+opt/trinity/share/doc/tde/HTML/en/guidance/compilation.html
+opt/trinity/share/doc/tde/HTML/en/guidance/configuration.html
 opt/trinity/share/applications/kde/serviceconfig.desktop
 opt/trinity/share/applications/kde/userconfig.desktop
 opt/trinity/share/applications/kde/mountconfig.desktop
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
index 856fa4932..5e704aa4a 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/tdesudo/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdesudo/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tdesudo/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/tdesvn/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdesvn/debian/cdbs/debian-qt-kde.mk
index 856fa4932..5e704aa4a 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tdesvn/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/tdesvn/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdesvn/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tdesvn/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/tellico/debian/rules b/ubuntu/maverick/applications/tellico/debian/rules
index b21fb6bd9..0f7236aad 100755
--- a/ubuntu/maverick/applications/tellico/debian/rules
+++ b/ubuntu/maverick/applications/tellico/debian/rules
@@ -70,7 +70,7 @@ config.status: configure
 	
 	# Add here commands to configure the package.
 	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-	kde_htmldir=\$${prefix}/share/doc/kde/HTML \
+	kde_htmldir=\$${prefix}/share/doc/tde/HTML \
 		./configure \
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
@@ -129,7 +129,7 @@ install: build
 	install -c -p -m 644 -T icons/tellico_mime.svg debian/tmp/opt/trinity/share/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
 
 	# Remove  dead symlink from French translation
-	rm debian/tmp/opt/trinity/share/doc/kde/HTML/fr/tellico/common
+	rm debian/tmp/opt/trinity/share/doc/tde/HTML/fr/tellico/common
 
 
 # Build architecture-independent files here.
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk b/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/wlassistant/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
index 856fa4932..5e704aa4a 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/wlassistant/debian/cdbs/kde.mk b/ubuntu/maverick/applications/wlassistant/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/wlassistant/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/yakuake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/yakuake/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/yakuake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/yakuake/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk b/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
index a5e510758..a4e1eaef5 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/cdbs/kde.mk b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/control b/ubuntu/maverick/kdegraphics.automake/debian/control
index f359ebd6f..43725b193 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/control
+++ b/ubuntu/maverick/kdegraphics.automake/debian/control
@@ -36,8 +36,8 @@ Description: KDE graphics documentation in HTML format
  HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /usr/share/doc/kde/HTML/<language>/<app>/, for instance
- /usr/share/doc/kde/HTML/en/kamera/. Documentation is provided for most
+ /usr/share/doc/tde/HTML/<language>/<app>/, for instance
+ /usr/share/doc/tde/HTML/en/kamera/. Documentation is provided for most
  KDE graphics packages.
  .
  This package is part of Trinity, and a component of the KDE graphics module.
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/control.in b/ubuntu/maverick/kdegraphics.automake/debian/control.in
index 7801bad78..39101788d 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/control.in
+++ b/ubuntu/maverick/kdegraphics.automake/debian/control.in
@@ -32,8 +32,8 @@ Description: KDE graphics documentation in HTML format
  HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /usr/share/doc/kde/HTML/<language>/<app>/, for instance
- /usr/share/doc/kde/HTML/en/kamera/. Documentation is provided for most
+ /usr/share/doc/tde/HTML/<language>/<app>/, for instance
+ /usr/share/doc/tde/HTML/en/kamera/. Documentation is provided for most
  KDE graphics packages.
  .
  This package is part of KDE, and a component of the KDE graphics module.
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kamera-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kamera-trinity.install
index 16f11dbf2..d1955c8f0 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kamera-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kamera-trinity.install
@@ -4,9 +4,9 @@ debian/tmp/opt/trinity/lib/trinity/kcm_kamera.so
 debian/tmp/opt/trinity/lib/trinity/kio_kamera.la
 debian/tmp/opt/trinity/lib/trinity/kio_kamera.so
 debian/tmp/opt/trinity/share/applications/kde/kamera.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kamera/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kamera/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kamera/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kamera/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kamera/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kamera/index.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/camera_test.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/camera.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/camera.png
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kcoloredit-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kcoloredit-trinity.install
index 70f637e8d..d885d8ed8 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kcoloredit-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kcoloredit-trinity.install
@@ -3,9 +3,9 @@ debian/tmp/opt/trinity/bin/kcoloredit
 debian/tmp/opt/trinity/share/applications/kde/kcolorchooser.desktop
 debian/tmp/opt/trinity/share/applications/kde/kcoloredit.desktop
 debian/tmp/opt/trinity/share/apps/kcoloredit/kcoloreditui.rc
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcoloredit/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcoloredit/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcoloredit/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcoloredit/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcoloredit/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcoloredit/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kcolorchooser.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kcoloredit.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kcolorchooser.png
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kamera b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kamera
index d59c53442..7909a26ea 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kamera
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kamera
@@ -5,6 +5,6 @@ Abstract: Kamera allows you to view and download images on a digital camera.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kamera/index.html
-Files: /usr/share/doc/kde/HTML/en/kamera/*.html
+Index: /usr/share/doc/tde/HTML/en/kamera/index.html
+Files: /usr/share/doc/tde/HTML/en/kamera/*.html
 
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kcoloredit b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kcoloredit
index 99b6d6e74..0d401a846 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kcoloredit
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kcoloredit
@@ -6,6 +6,6 @@ Abstract: KColorEdit is a palette files editor. It can be used for editing
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kcoloredit/index.html
-Files: /usr/share/doc/kde/HTML/en/kcoloredit/*.html
+Index: /usr/share/doc/tde/HTML/en/kcoloredit/index.html
+Files: /usr/share/doc/tde/HTML/en/kcoloredit/*.html
 
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kdvi b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kdvi
index bc08bb1a5..9f0bf4ab8 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kdvi
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kdvi
@@ -5,6 +5,6 @@ Abstract: This program and KPart allow the user to display *.DVI files from TeX.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kdvi/index.html
-Files: /usr/share/doc/kde/HTML/en/kdvi/*.html
+Index: /usr/share/doc/tde/HTML/en/kdvi/index.html
+Files: /usr/share/doc/tde/HTML/en/kdvi/*.html
 
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kgamma b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kgamma
index 4f714187e..2ce9d716f 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kgamma
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kgamma
@@ -5,6 +5,6 @@ Abstract: KGamma is a simple tool for monitor gamma correction.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kgamma/index.html
-Files: /usr/share/doc/kde/HTML/en/kgamma/*.html
+Index: /usr/share/doc/tde/HTML/en/kgamma/index.html
+Files: /usr/share/doc/tde/HTML/en/kgamma/*.html
 
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kghostview b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kghostview
index 60fb9060e..e18d32a2a 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kghostview
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kghostview
@@ -6,6 +6,6 @@ Abstract: KGhostView displays and prints PostScript and
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kghostview/index.html
-Files: /usr/share/doc/kde/HTML/en/kghostview/*.html
+Index: /usr/share/doc/tde/HTML/en/kghostview/index.html
+Files: /usr/share/doc/tde/HTML/en/kghostview/*.html
 
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kiconedit b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kiconedit
index 92959c240..6e974fd53 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kiconedit
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kiconedit
@@ -6,6 +6,6 @@ Abstract: KIconEdit is designed to help create icons for KDE using the
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kiconedit/index.html
-Files: /usr/share/doc/kde/HTML/en/kiconedit/*.html
+Index: /usr/share/doc/tde/HTML/en/kiconedit/index.html
+Files: /usr/share/doc/tde/HTML/en/kiconedit/*.html
 
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kolourpaint b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kolourpaint
index 1d1164d7b..7913d8654 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kolourpaint
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kolourpaint
@@ -5,6 +5,6 @@ Abstract: KolourPaint is a free, easy-to-use paint program for KDE.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kolourpaint/index.html
-Files: /usr/share/doc/kde/HTML/en/kolourpaint/*.html
+Index: /usr/share/doc/tde/HTML/en/kolourpaint/index.html
+Files: /usr/share/doc/tde/HTML/en/kolourpaint/*.html
 
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kooka b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kooka
index ddc5cde52..d009db00c 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kooka
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kooka
@@ -5,6 +5,6 @@ Abstract: Kooka is a very useful KDE scanning application.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kooka/index.html
-Files: /usr/share/doc/kde/HTML/en/kooka/*.html
+Index: /usr/share/doc/tde/HTML/en/kooka/index.html
+Files: /usr/share/doc/tde/HTML/en/kooka/*.html
 
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpdf b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpdf
index ce0ad85f8..2060502d2 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpdf
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpdf
@@ -5,6 +5,6 @@ Abstract: KPDF is a KDE PDF viewer based on xpdf code.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kpdf/index.html
-Files: /usr/share/doc/kde/HTML/en/kpdf/*.html
+Index: /usr/share/doc/tde/HTML/en/kpdf/index.html
+Files: /usr/share/doc/tde/HTML/en/kpdf/*.html
 
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpovmodeler b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpovmodeler
index fa77c4a1c..ea24b515e 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpovmodeler
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpovmodeler
@@ -6,6 +6,6 @@ Abstract: KPovModeler is a graphical 3D modeler, which can generate
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kpovmodeler/index.html
-Files: /usr/share/doc/kde/HTML/en/kpovmodeler/*.html
+Index: /usr/share/doc/tde/HTML/en/kpovmodeler/index.html
+Files: /usr/share/doc/tde/HTML/en/kpovmodeler/*.html
 
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kruler b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kruler
index f6b3de6a3..d86f6da8e 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kruler
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kruler
@@ -5,6 +5,6 @@ Abstract: KRuler can be used to measure objects on the screen.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kruler/index.html
-Files: /usr/share/doc/kde/HTML/en/kruler/*.html
+Index: /usr/share/doc/tde/HTML/en/kruler/index.html
+Files: /usr/share/doc/tde/HTML/en/kruler/*.html
 
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.ksnapshot b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.ksnapshot
index 1518b4854..97006ef6e 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.ksnapshot
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.ksnapshot
@@ -5,6 +5,6 @@ Abstract: KSnapshot is a simple applet for taking screenshots.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/ksnapshot/index.html
-Files: /usr/share/doc/kde/HTML/en/ksnapshot/*.html
+Index: /usr/share/doc/tde/HTML/en/ksnapshot/index.html
+Files: /usr/share/doc/tde/HTML/en/ksnapshot/*.html
 
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kuickshow b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kuickshow
index e18e99ea0..fdb5baa20 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kuickshow
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kuickshow
@@ -5,6 +5,6 @@ Abstract: KuickShow is a comfortable image browser/viewer.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kuickshow/index.html
-Files: /usr/share/doc/kde/HTML/en/kuickshow/*.html
+Index: /usr/share/doc/tde/HTML/en/kuickshow/index.html
+Files: /usr/share/doc/tde/HTML/en/kuickshow/*.html
 
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kview b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kview
index 018bcbe82..8824a84f5 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kview
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kview
@@ -5,6 +5,6 @@ Abstract: KView is an image viewing program.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kview/index.html
-Files: /usr/share/doc/kde/HTML/en/kview/*.html
+Index: /usr/share/doc/tde/HTML/en/kview/index.html
+Files: /usr/share/doc/tde/HTML/en/kview/*.html
 
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.install
index 288ee8fed..b0170ca7c 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.install
@@ -6,17 +6,17 @@ debian/tmp/opt/trinity/share/apps/kdvi/kdvi_part.rc
 debian/tmp/opt/trinity/share/apps/kdvi/kviewshell.rc
 debian/tmp/opt/trinity/share/apps/kdvi/tips
 debian/tmp/opt/trinity/share/config.kcfg/kdvi.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/aboutkde.ps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/KDVI-features.dvi
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/KDVI-features.tex
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/kdvi-search.el
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/optionrequester1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/optionrequester2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/srcltx.sty
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/srctex.sty
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/aboutkde.ps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/KDVI-features.dvi
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/KDVI-features.tex
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/kdvi-search.el
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/optionrequester1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/optionrequester2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/srcltx.sty
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/srctex.sty
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kdvi.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kdvi.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kdvi.png
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kgamma-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kgamma-trinity.install
index 4da99e829..4b4875ac9 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kgamma-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kgamma-trinity.install
@@ -9,9 +9,9 @@ debian/tmp/opt/trinity/share/apps/kgamma/pics/greyscale.png
 debian/tmp/opt/trinity/share/apps/kgamma/pics/lightgrey.png
 debian/tmp/opt/trinity/share/apps/kgamma/pics/midgrey.png
 debian/tmp/opt/trinity/share/apps/kgamma/pics/rgbscale.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kgamma/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kgamma/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kgamma/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kgamma/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kgamma/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kgamma/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kgamma.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kgamma.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kgamma.png
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.install
index 8bb376a3c..b967faccf 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.install
@@ -10,9 +10,9 @@ debian/tmp/opt/trinity/share/apps/kghostview/kghostviewui.rc
 debian/tmp/opt/trinity/share/apps/kghostview/kgv_part.rc
 debian/tmp/opt/trinity/share/apps/kghostview/pdf_sec.ps
 debian/tmp/opt/trinity/share/config.kcfg/kghostview.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kghostview/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kghostview/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kghostview/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kghostview/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kghostview/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kghostview/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kghostview.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kghostview.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kghostview.png
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kiconedit-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kiconedit-trinity.install
index ee15c189c..66bf9a180 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kiconedit-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kiconedit-trinity.install
@@ -28,10 +28,10 @@ debian/tmp/opt/trinity/share/apps/kiconedit/pics/source.png
 debian/tmp/opt/trinity/share/apps/kiconedit/pics/standard.png
 debian/tmp/opt/trinity/share/apps/kiconedit/pics/transform.png
 debian/tmp/opt/trinity/share/apps/kiconedit/pics/window_new.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kiconedit/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kiconedit/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kiconedit/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kiconedit/kiconedit-configuration.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/kiconedit-configuration.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kiconedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kiconedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kiconedit.png
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kolourpaint-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kolourpaint-trinity.install
index d081a577f..3ee0f1de8 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kolourpaint-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kolourpaint-trinity.install
@@ -110,58 +110,58 @@ debian/tmp/opt/trinity/share/apps/kolourpaint/pics/smooth_scale.png
 debian/tmp/opt/trinity/share/apps/kolourpaint/pics/tool_spraycan_17x17.png
 debian/tmp/opt/trinity/share/apps/kolourpaint/pics/tool_spraycan_29x29.png
 debian/tmp/opt/trinity/share/apps/kolourpaint/pics/tool_spraycan_9x9.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/brush_shapes.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/color_box.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/eraser_shapes.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/fcc_std_text.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/fcc_trans_text.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/fill_color_similarity.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/fill_style.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/image_balance.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/image_emboss.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/image_flatten.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/image_flip.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/image_invert.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/image_reduce_colors.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/image_resize_scale.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/image_rotate.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/image_skew.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/image_soften_sharpen.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/kolourpaint-main.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/line_width.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/lines_30_45_deg.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/lines_30_deg.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/lines_45_deg.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/rotate_image_30.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/rotate_selection_30.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/selections_opaque_transparent.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/spraycan_patterns.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/text_zoom_grid.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_brush.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_color_picker.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_color_washer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_curve.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_ellipse.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_elliptical_selection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_eraser.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_flood_fill.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_free_form_selection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_line.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_pen.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_polygon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_polyline.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_polystar.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_rect_selection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_rectangle.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_rectangles.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_rounded_rectangle.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_selections.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_spraycan.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_text.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/view_thumbnails.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/brush_shapes.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/color_box.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/eraser_shapes.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/fcc_std_text.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/fcc_trans_text.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/fill_color_similarity.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/fill_style.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/image_balance.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/image_emboss.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/image_flatten.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/image_flip.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/image_invert.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/image_reduce_colors.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/image_resize_scale.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/image_rotate.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/image_skew.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/image_soften_sharpen.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/kolourpaint-main.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/line_width.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/lines_30_45_deg.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/lines_30_deg.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/lines_45_deg.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/rotate_image_30.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/rotate_selection_30.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/selections_opaque_transparent.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/spraycan_patterns.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/text_zoom_grid.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_brush.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_color_picker.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_color_washer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_curve.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_ellipse.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_elliptical_selection.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_eraser.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_flood_fill.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_free_form_selection.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_line.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_pen.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_polygon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_polyline.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_polystar.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_rect_selection.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_rectangle.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_rectangles.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_rounded_rectangle.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_selections.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_spraycan.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_text.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/view_thumbnails.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kolourpaint.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kolourpaint.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kolourpaint.png
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kooka-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kooka-trinity.install
index 38d064424..958395531 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kooka-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kooka-trinity.install
@@ -15,18 +15,18 @@ debian/tmp/opt/trinity/share/apps/kooka/pics/scaleorig.png
 debian/tmp/opt/trinity/share/apps/kooka/pics/scaletoheight.png
 debian/tmp/opt/trinity/share/apps/kooka/pics/scaletowidth.png
 debian/tmp/opt/trinity/share/apps/kooka/pics/thumbviewtile.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/kooka_gocr.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/kooka_gocr_result.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/kooka_mainctrl.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/ocr-select.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/shortcut0.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/shortcut1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/toolbar.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/toolbar1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/toolbar2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/kooka_gocr.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/kooka_gocr_result.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/kooka_mainctrl.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/ocr-select.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/shortcut0.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/shortcut1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/toolbar.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/toolbar1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/toolbar2.png
 
 debian/icons/kooka.xpm		/usr/share/pixmaps
 debian/icons/kooka-16.xpm	/usr/share/pixmaps
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.install
index 29584fa07..85cde09a4 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.install
@@ -5,10 +5,10 @@ debian/tmp/opt/trinity/share/applications/kde/kpdf.desktop
 debian/tmp/opt/trinity/share/apps/kpdf/shell.rc
 debian/tmp/opt/trinity/share/apps/kpdfpart/part.rc
 debian/tmp/opt/trinity/share/config.kcfg/kpdf.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpdf/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpdf/configure.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpdf/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpdf/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpdf/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpdf/configure.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpdf/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpdf/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kpdf.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kpdf.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kpdf.png
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.install
index 84b6083ef..d0e50b60a 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.install
@@ -362,58 +362,58 @@ debian/tmp/opt/trinity/share/apps/kpovmodeler/kpovmodelershell.rc
 debian/tmp/opt/trinity/share/apps/kpovmodeler/kpovmodelerui.rc
 debian/tmp/opt/trinity/share/apps/kpovmodeler/povraydocmap.xml
 debian/tmp/opt/trinity/share/apps/kpovmodeler/questionmark.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cameraview.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/controlpoints.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmcamera.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmcolorlist.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmfinish.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pminterior.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmlight.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmpigment.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmplane.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmrender.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmsolidcolor.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmsphere.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/defaultviewlayout.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/dockwidget.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/dockwidgettab.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/insertaspopup.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/objectpropertiesview.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/objecttree.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/rendericon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/rendermodeoutput.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/rendermodequality.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/rendermodesize.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/rendermodesselection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/rendermodestoolbar.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/rendersettingsicon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/renderwindow.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/texturepreview.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/topview.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-camera-dialog.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-camera-graphic.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-final-render.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-color-list.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-pigment.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-render.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-solid-color-1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-solid-color-2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-wrong-colors-render.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-light-dialog.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-light-graphic.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-plane-dialog.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-plane-graphic.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-plane-tree-expanded.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-plane-tree-translate.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-dialog.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-finish-dialog.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-render-finish.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-render-nocolor.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-render-solidcolor.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-solid-color.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cameraview.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/controlpoints.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cr22-action-pmcamera.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cr22-action-pmcolorlist.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cr22-action-pmfinish.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cr22-action-pminterior.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cr22-action-pmlight.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cr22-action-pmpigment.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cr22-action-pmplane.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cr22-action-pmrender.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cr22-action-pmsolidcolor.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cr22-action-pmsphere.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/defaultviewlayout.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/dockwidget.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/dockwidgettab.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/insertaspopup.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/objectpropertiesview.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/objecttree.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/rendericon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/rendermodeoutput.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/rendermodequality.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/rendermodesize.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/rendermodesselection.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/rendermodestoolbar.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/rendersettingsicon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/renderwindow.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/texturepreview.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/topview.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-camera-dialog.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-camera-graphic.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-final-render.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-ground-color-list.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-ground-pigment.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-ground-render.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-ground-solid-color-1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-ground-solid-color-2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-ground-wrong-colors-render.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-light-dialog.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-light-graphic.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-plane-dialog.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-plane-graphic.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-plane-tree-expanded.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-plane-tree-translate.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-sphere-dialog.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-sphere-finish-dialog.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-sphere-render-finish.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-sphere-render-nocolor.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-sphere-render-solidcolor.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-sphere-solid-color.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kpovmodeler.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kpovmodeler.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kpovmodeler.png
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kruler-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kruler-trinity.install
index b39d5a2e0..9256c231a 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kruler-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kruler-trinity.install
@@ -7,9 +7,9 @@ debian/tmp/opt/trinity/share/apps/kruler/pics/kruler-north.png
 debian/tmp/opt/trinity/share/apps/kruler/pics/kruler-south.png
 debian/tmp/opt/trinity/share/apps/kruler/pics/kruler-west.png
 debian/tmp/opt/trinity/share/apps/kruler/sounds/move.wav
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kruler/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kruler/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kruler/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kruler/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kruler/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kruler/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kruler.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kruler.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kruler.png
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/ksnapshot-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/ksnapshot-trinity.install
index 460875310..4b83732a3 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/ksnapshot-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/ksnapshot-trinity.install
@@ -1,10 +1,10 @@
 debian/tmp/opt/trinity/bin/ksnapshot
 debian/tmp/opt/trinity/share/applications/kde/ksnapshot.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksnapshot/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksnapshot/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksnapshot/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksnapshot/preview.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksnapshot/window.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksnapshot/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksnapshot/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksnapshot/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksnapshot/preview.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksnapshot/window.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/ksnapshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/ksnapshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/ksnapshot.png
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.install
index d9ef57977..24e372536 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.install
@@ -13,10 +13,10 @@ debian/tmp/opt/trinity/share/apps/kuickshow/pics/ksslide.png
 debian/tmp/opt/trinity/share/apps/kuickshow/pics/kuickshow-day.jpg
 debian/tmp/opt/trinity/share/apps/kuickshow/pics/kuickshow-night.jpg
 debian/tmp/opt/trinity/share/apps/kuickshow/pics/logo.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kuickshow/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kuickshow/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kuickshow/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kuickshow/screenshot.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuickshow/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuickshow/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuickshow/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuickshow/screenshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kuickshow.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kuickshow.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kuickshow.png
@@ -24,7 +24,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kuickshow.png
 debian/icons/kuickshow.xpm		/usr/share/pixmaps
 debian/icons/kuickshow-16.xpm		/usr/share/pixmaps
 
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kuickshow/screenshot.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kuickshow/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kuickshow/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kuickshow/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuickshow/screenshot.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuickshow/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuickshow/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuickshow/index.docbook
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.install
index ca570ad61..31348d439 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.install
@@ -41,11 +41,11 @@ debian/tmp/opt/trinity/share/apps/kviewviewer/kviewpopup.rc
 debian/tmp/opt/trinity/share/apps/kviewviewer/kviewviewer.rc
 debian/tmp/opt/trinity/share/apps/kviewviewer/kviewviewer_ro.rc
 debian/tmp/opt/trinity/share/apps/photobook/photobookui.rc
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kview/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kview/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kview/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kview/kview-application-configuration.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kview/kview-viewer-configuration.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kview/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kview/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kview/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kview/kview-application-configuration.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kview/kview-viewer-configuration.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/photobook.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/photobook.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kview.png
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
index cae625265..d135c4257 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/kde.mk b/ubuntu/maverick/kdevelop.cmake/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/kdevelop.cmake/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity-doc.install b/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity-doc.install
index e14858a44..8d78fbd5e 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity-doc.install
+++ b/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity-doc.install
@@ -1,7 +1,7 @@
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdevelop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdevelop-apidocs/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kde_app_devel/appwizard.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kde_app_devel/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kde_app_devel/kscribblefiles.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kde_app_devel/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kde_app_devel/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdevelop
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdevelop-apidocs/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/appwizard.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/kscribblefiles.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/common
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk b/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk b/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/kde.mk b/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/libraries/libkipi/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk b/ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.install b/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.install
index d8b987d87..1d69ae1ee 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.install
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.install
@@ -4,4 +4,4 @@ opt/trinity/share/apps/pytdeextensions/ChangeLog
 opt/trinity/share/apps/pytdeextensions/INSTALL
 opt/trinity/share/apps/pytdeextensions/NEWS
 opt/trinity/share/apps/pytdeextensions/app_templates
-opt/trinity/share/doc/kde/HTML/en/pytdeextensions
+opt/trinity/share/doc/tde/HTML/en/pytdeextensions
diff --git a/ubuntu/maverick/tde-i18n/debian/debiandirs b/ubuntu/maverick/tde-i18n/debian/debiandirs
index 2d0da0c80..90247b9a0 100644
--- a/ubuntu/maverick/tde-i18n/debian/debiandirs
+++ b/ubuntu/maverick/tde-i18n/debian/debiandirs
@@ -6,5 +6,5 @@ export mandir=/opt/trinity/share/man
 export qtdir=/opt/trinity/share/qt3
 export kde_cgidir=/opt/trinity/lib/cgi-bin
 export kde_confdir=/etc/trinity
-export kde_htmldir=/opt/trinity/share/doc/kde/HTML
+export kde_htmldir=/opt/trinity/share/doc/tde/HTML
 configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir)
diff --git a/ubuntu/maverick/tdeaccessibility/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdeaccessibility/debian/cdbs/debian-qt-kde.mk
index cae625265..d135c4257 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdeaccessibility/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/tdeaccessibility/debian/cdbs/kde.mk b/ubuntu/maverick/tdeaccessibility/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdeaccessibility/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/tdeaccessibility/debian/control b/ubuntu/maverick/tdeaccessibility/debian/control
index 0adaaa9f0..b01258e23 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/control
+++ b/ubuntu/maverick/tdeaccessibility/debian/control
@@ -39,8 +39,8 @@ Description: KDE accessibility documentation in HTML format
  to HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /opt/trinity/share/doc/kde/HTML/<language>/<app>/, for instance
- /opt/trinity/share/doc/kde/HTML/en/kmag/. Documentation is provided for most
+ /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
+ /opt/trinity/share/doc/tde/HTML/en/kmag/. Documentation is provided for most
  KDE accessibility packages.
  .
  This package is part of Trinity, and a component of the KDE accessibility
diff --git a/ubuntu/maverick/tdeaccessibility/debian/control.in b/ubuntu/maverick/tdeaccessibility/debian/control.in
index ece22c85f..f63190563 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/control.in
+++ b/ubuntu/maverick/tdeaccessibility/debian/control.in
@@ -35,8 +35,8 @@ Description: KDE accessibility documentation in HTML format
  to HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /opt/trinity/share/doc/kde/HTML/<language>/<app>/, for instance
- /opt/trinity/share/doc/kde/HTML/en/kmag/. Documentation is provided for most
+ /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
+ /opt/trinity/share/doc/tde/HTML/en/kmag/. Documentation is provided for most
  KDE accessibility packages.
  .
  This package is part of KDE, and a component of the KDE accessibility
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kmag-trinity.install b/ubuntu/maverick/tdeaccessibility/debian/kmag-trinity.install
index 23435d8a2..246740b9c 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kmag-trinity.install
+++ b/ubuntu/maverick/tdeaccessibility/debian/kmag-trinity.install
@@ -4,11 +4,11 @@ debian/tmp/opt/trinity/share/apps/kmag/icons/hicolor/16x16/actions/followmouse.p
 debian/tmp/opt/trinity/share/apps/kmag/icons/hicolor/16x16/actions/hidemouse.png
 debian/tmp/opt/trinity/share/apps/kmag/icons/hicolor/16x16/actions/window.png
 debian/tmp/opt/trinity/share/apps/kmag/kmagui.rc
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmag/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmag/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmag/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmag/man-kmag.1.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmag/screenshot.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmag/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmag/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmag/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmag/man-kmag.1.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmag/screenshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmag.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmag.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kmag.png
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kmousetool-trinity.install b/ubuntu/maverick/tdeaccessibility/debian/kmousetool-trinity.install
index 68fe81dde..51eb07e7e 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kmousetool-trinity.install
+++ b/ubuntu/maverick/tdeaccessibility/debian/kmousetool-trinity.install
@@ -7,10 +7,10 @@ debian/tmp/opt/trinity/share/apps/kmousetool/icons/hicolor/32x32/actions/kmouset
 debian/tmp/opt/trinity/share/apps/kmousetool/icons/hicolor/32x32/actions/kmousetool_on.png
 debian/tmp/opt/trinity/share/apps/kmousetool/icons/hicolor/32x32/apps/kmousetool.png
 debian/tmp/opt/trinity/share/apps/kmousetool/sounds/mousetool_tap.wav
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmousetool/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmousetool/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmousetool/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmousetool/man-kmousetool.1.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmousetool/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmousetool/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmousetool/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmousetool/man-kmousetool.1.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmousetool.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmousetool.png
 
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kmouth-trinity.install b/ubuntu/maverick/tdeaccessibility/debian/kmouth-trinity.install
index aab5f6701..b9eed5500 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kmouth-trinity.install
+++ b/ubuntu/maverick/tdeaccessibility/debian/kmouth-trinity.install
@@ -58,22 +58,22 @@ debian/tmp/opt/trinity/share/apps/kmouth/icons/hicolor/32x32/actions/speak.png
 debian/tmp/opt/trinity/share/apps/kmouth/icons/hicolor/48x48/actions/speak.png
 debian/tmp/opt/trinity/share/apps/kmouth/kmouthui.rc
 debian/tmp/opt/trinity/share/apps/kmouth/phrasebookdialogui.rc
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmouth/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmouth/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmouth/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmouth/kmouthcpref.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmouth/kmouthcpref.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmouth/kmouthctts.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmouth/kmouthctts.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmouth/kmouthcwcp.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmouth/kmouthcwcp.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmouth/kmouthedit.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmouth/kmouthedit.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmouth/kmouthmain.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmouth/kmouthmain.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmouth/kmouthwizard.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmouth/kmouthwizard.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmouth/man-kmouth.1.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmouth/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmouth/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmouth/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmouth/kmouthcpref.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmouth/kmouthcpref.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmouth/kmouthctts.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmouth/kmouthctts.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmouth/kmouthcwcp.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmouth/kmouthcwcp.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmouth/kmouthedit.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmouth/kmouthedit.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmouth/kmouthmain.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmouth/kmouthmain.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmouth/kmouthwizard.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmouth/kmouthwizard.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmouth/man-kmouth.1.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/speak.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/nospeak.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/speak.png
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install b/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install
index 1c2554962..550a4fa02 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install
+++ b/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install
@@ -54,22 +54,22 @@ debian/tmp/opt/trinity/share/apps/kttsd/talkerchooser/female_notifications_rc
 debian/tmp/opt/trinity/share/apps/kttsd/xmltransformer/xhtml2ssml.xsl
 debian/tmp/opt/trinity/share/apps/kttsd/xmltransformer/xhtml2ssml_simple.xsl
 debian/tmp/opt/trinity/share/apps/kttsd/xslt/SSMLtoPlainText.xsl
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/addtalker.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/audio.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/festivalintconf.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/filters.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/general.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/interruption.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/jobs.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/notifications.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/selecttalker.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/stringreplacer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/talkerchooser.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/talkers.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/xmltransformer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/addtalker.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/audio.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/festivalintconf.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/filters.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/general.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/interruption.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/jobs.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/notifications.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/selecttalker.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/stringreplacer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkerchooser.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkers.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/xmltransformer.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/female.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/male.png
 debian/tmp/opt/trinity/share/services/ktexteditor_kttsd.desktop
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 b/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64
index 780e2bc62..ad08c3f72 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64
+++ b/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64
@@ -52,22 +52,22 @@ debian/tmp/usr/share/apps/kttsd/talkerchooser/female_notifications_rc
 debian/tmp/usr/share/apps/kttsd/xmltransformer/xhtml2ssml.xsl
 debian/tmp/usr/share/apps/kttsd/xmltransformer/xhtml2ssml_simple.xsl
 debian/tmp/usr/share/apps/kttsd/xslt/SSMLtoPlainText.xsl
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/addtalker.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/audio.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/festivalintconf.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/filters.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/general.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/interruption.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/jobs.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/notifications.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/selecttalker.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/stringreplacer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/talkerchooser.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/talkers.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/xmltransformer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/addtalker.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/audio.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/festivalintconf.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/filters.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/general.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/interruption.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/jobs.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/notifications.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/selecttalker.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/stringreplacer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkerchooser.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkers.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/xmltransformer.png
 debian/tmp/usr/share/icons/hicolor/16x16/actions/female.png
 debian/tmp/usr/share/icons/hicolor/16x16/actions/male.png
 debian/tmp/usr/share/services/ktexteditor_kttsd.desktop
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 b/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386
index 780e2bc62..ad08c3f72 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386
+++ b/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386
@@ -52,22 +52,22 @@ debian/tmp/usr/share/apps/kttsd/talkerchooser/female_notifications_rc
 debian/tmp/usr/share/apps/kttsd/xmltransformer/xhtml2ssml.xsl
 debian/tmp/usr/share/apps/kttsd/xmltransformer/xhtml2ssml_simple.xsl
 debian/tmp/usr/share/apps/kttsd/xslt/SSMLtoPlainText.xsl
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/addtalker.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/audio.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/festivalintconf.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/filters.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/general.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/interruption.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/jobs.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/notifications.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/selecttalker.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/stringreplacer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/talkerchooser.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/talkers.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kttsd/xmltransformer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/addtalker.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/audio.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/festivalintconf.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/filters.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/general.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/interruption.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/jobs.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/notifications.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/selecttalker.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/stringreplacer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkerchooser.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/talkers.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kttsd/xmltransformer.png
 debian/tmp/usr/share/icons/hicolor/16x16/actions/female.png
 debian/tmp/usr/share/icons/hicolor/16x16/actions/male.png
 debian/tmp/usr/share/services/ktexteditor_kttsd.desktop
diff --git a/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmag b/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmag
index 0c754d661..6e09eddcf 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmag
+++ b/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmag
@@ -5,6 +5,6 @@ Abstract: KMag is a screen magnifier.
 Section: Apps/Utils 
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kmag/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kmag/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kmag/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kmag/*.html
 
diff --git a/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmousetool b/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmousetool
index 082e122c8..91d14cd2a 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmousetool
+++ b/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmousetool
@@ -5,6 +5,6 @@ Abstract: KMouseTool clicks the mouse whenever the mouse cursor pauses briefly.
 Section: Apps/Utils
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kmousetool/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kmousetool/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kmousetool/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kmousetool/*.html
 
diff --git a/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmouth b/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmouth
index 041d8f235..9b96ff559 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmouth
+++ b/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmouth
@@ -6,6 +6,6 @@ Abstract: KMouth is an application that allows people that cannot speak
 Section: Apps/Text
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kmouth/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kmouth/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kmouth/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kmouth/*.html
 
diff --git a/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kttsd b/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kttsd
index 0780c2ece..ee541bac4 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kttsd
+++ b/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kttsd
@@ -6,6 +6,6 @@ Abstract: The KDE Text-to-Speech system is a plugin based service that
 Section: Apps/Text
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kttsd/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kttsd/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kttsd/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kttsd/*.html
 
diff --git a/ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk
index cae625265..d135c4257 100644
--- a/ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/tdeaddons/debian/cdbs/kde.mk b/ubuntu/maverick/tdeaddons/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/tdeaddons/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdeaddons/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/tdeaddons/debian/control b/ubuntu/maverick/tdeaddons/debian/control
index 1cdd28ec6..3d4f5ed94 100644
--- a/ubuntu/maverick/tdeaddons/debian/control
+++ b/ubuntu/maverick/tdeaddons/debian/control
@@ -36,8 +36,8 @@ Description: KDE add-ons documentation in HTML format
  converted to HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /opt/trinity/share/doc/kde/HTML/<language>/<app>/, for instance
- /opt/trinity/share/doc/kde/HTML/en/kicker-applets/. Documentation is provided for
+ /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
+ /opt/trinity/share/doc/tde/HTML/en/kicker-applets/. Documentation is provided for
  most KDE addons packages.
  .
  This package is part of Trinity, as a component of the KDE addons module.
diff --git a/ubuntu/maverick/tdeaddons/debian/control.in b/ubuntu/maverick/tdeaddons/debian/control.in
index 1911a0d6d..a06975a86 100644
--- a/ubuntu/maverick/tdeaddons/debian/control.in
+++ b/ubuntu/maverick/tdeaddons/debian/control.in
@@ -32,8 +32,8 @@ Description: KDE add-ons documentation in HTML format
  converted to HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /opt/trinity/share/doc/kde/HTML/<language>/<app>/, for instance
- /opt/trinity/share/doc/kde/HTML/en/kicker-applets/. Documentation is provided for
+ /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
+ /opt/trinity/share/doc/tde/HTML/en/kicker-applets/. Documentation is provided for
  most KDE addons packages.
  .
  This package is part of KDE, as a component of the KDE addons module.
diff --git a/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.install b/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.install
index 9dc3f2b7d..06e96f20f 100644
--- a/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.install
+++ b/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.install
@@ -32,11 +32,11 @@ debian/tmp/opt/trinity/share/applnk/.hidden/katefll.desktop
 debian/tmp/opt/trinity/share/apps/kate
 debian/tmp/opt/trinity/share/apps/katepart
 debian/tmp/opt/trinity/share/apps/katexmltools
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate-plugins/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate-plugins/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate-plugins/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate-plugins/configure_insertcommand.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate-plugins/insertcommand.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate-plugins/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate-plugins/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate-plugins/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate-plugins/configure_insertcommand.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate-plugins/insertcommand.png
 debian/tmp/opt/trinity/share/services/katecppsymbolviewer.desktop
 debian/tmp/opt/trinity/share/services/katefiletemplates.desktop
 debian/tmp/opt/trinity/share/services/katefll_plugin.desktop
diff --git a/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.install b/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.install
index d4dfe6204..2ab92dddd 100644
--- a/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.install
+++ b/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.install
@@ -11,9 +11,9 @@ debian/tmp/opt/trinity/lib/trinity/kbinaryclock_panelapplet.so
 debian/tmp/opt/trinity/share/apps/kicker/applets
 debian/tmp/opt/trinity/share/apps/mediacontrol
 debian/tmp/opt/trinity/share/config.kcfg/kbinaryclock.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kicker-applets/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kicker-applets/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kicker-applets/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker-applets/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker-applets/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker-applets/*.docbook
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/ktimemon.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/ktimemon.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/ktimemon.png
diff --git a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.install b/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.install
index e4d4e14c7..c74edf4ce 100644
--- a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.install
+++ b/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.install
@@ -86,46 +86,46 @@ debian/tmp/opt/trinity/share/apps/metabar/themes/default/default.css
 debian/tmp/opt/trinity/share/apps/metabar/themes/default/layout.html
 debian/tmp/opt/trinity/share/apps/microformat/pics/microformat.png
 debian/tmp/opt/trinity/share/config.kcfg/konq_sidebarnews.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/babel/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/babel/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/babel/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/crashes/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/crashes/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/crashes/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/dirfilter/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/dirfilter/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/dirfilter/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/domtreeviewer/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/domtreeviewer/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/domtreeviewer/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/fsview/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/fsview/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/fsview/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/imgallery/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/imgallery/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/imgallery/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/imgallery/*.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/khtmlsettings/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/khtmlsettings/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/khtmlsettings/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/kuick/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/kuick/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/kuick/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/mediaplayer/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/mediaplayer/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/mediaplayer/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/uachanger/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/uachanger/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/uachanger/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/validators/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/validators/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/validators/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/webarchiver/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/webarchiver/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konq-plugins/webarchiver/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/babel/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/babel/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/babel/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/crashes/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/crashes/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/crashes/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/dirfilter/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/dirfilter/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/dirfilter/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/domtreeviewer/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/domtreeviewer/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/domtreeviewer/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/fsview/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/fsview/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/fsview/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/imgallery/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/imgallery/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/imgallery/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/imgallery/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/khtmlsettings/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/khtmlsettings/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/khtmlsettings/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/kuick/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/kuick/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/kuick/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/mediaplayer/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/mediaplayer/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/mediaplayer/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/uachanger/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/uachanger/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/uachanger/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/validators/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/validators/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/validators/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/webarchiver/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/webarchiver/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konq-plugins/webarchiver/index.docbook
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/autorefresh.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/babelfish.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/cssvalidator.png
diff --git a/ubuntu/maverick/tdeaddons/debian/ksig-trinity.install b/ubuntu/maverick/tdeaddons/debian/ksig-trinity.install
index 07161eff5..9f0d70be0 100644
--- a/ubuntu/maverick/tdeaddons/debian/ksig-trinity.install
+++ b/ubuntu/maverick/tdeaddons/debian/ksig-trinity.install
@@ -4,7 +4,7 @@ debian/tmp/opt/trinity/share/apps/ksig/ksigui.rc
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/ksig.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/ksig.png
 debian/icons/ksig.xpm /opt/trinity/share/pixmaps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksig/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksig/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksig/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksig/screenshot.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksig/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksig/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksig/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksig/screenshot.png
diff --git a/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kate-plugins b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kate-plugins
index f267f739c..7ac60d1c1 100644
--- a/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kate-plugins
+++ b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kate-plugins
@@ -6,6 +6,6 @@ Abstract: This is the handbook for the plugins for Kate, KDE's Advanced Text
 Section: Apps/Editors
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kate-plugins/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kate-plugins/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kate-plugins/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kate-plugins/*.html
 
diff --git a/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kicker-applets b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kicker-applets
index c83edbc2a..ff75b2108 100644
--- a/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kicker-applets
+++ b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kicker-applets
@@ -5,6 +5,6 @@ Abstract: This is the handbook for the addon applets for Kicker, KDE's panel.
 Section: Apps/Tools
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kicker-applets/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kicker-applets/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kicker-applets/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kicker-applets/*.html
 
diff --git a/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.konq-plugins b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.konq-plugins
index ac6bcd0fd..d4251adb6 100644
--- a/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.konq-plugins
+++ b/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.konq-plugins
@@ -6,6 +6,6 @@ Abstract: This is the handbook for the additional plugins for Konqueror, the
 Section: Apps/Tools
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/konq-plugins/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/konq-plugins/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/konq-plugins/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/konq-plugins/*.html
 
diff --git a/ubuntu/maverick/tdeadmin/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdeadmin/debian/cdbs/debian-qt-kde.mk
index cae625265..d135c4257 100644
--- a/ubuntu/maverick/tdeadmin/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdeadmin/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk b/ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/tdeadmin/debian/control b/ubuntu/maverick/tdeadmin/debian/control
index 76819b941..938c08b6c 100644
--- a/ubuntu/maverick/tdeadmin/debian/control
+++ b/ubuntu/maverick/tdeadmin/debian/control
@@ -37,8 +37,8 @@ Description: KDE administration documentation in HTML format
  converted to HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /usr/share/doc/kde/HTML/<language>/<app>/, for instance
- /usr/share/doc/kde/HTML/en/kcron/. Documentation is provided for most
+ /usr/share/doc/tde/HTML/<language>/<app>/, for instance
+ /usr/share/doc/tde/HTML/en/kcron/. Documentation is provided for most
  KDE administration packages.
  .
  This package is part of Trinity, and a component of the KDE administration
diff --git a/ubuntu/maverick/tdeadmin/debian/control.in b/ubuntu/maverick/tdeadmin/debian/control.in
index 5d67ada60..7ab7a91aa 100644
--- a/ubuntu/maverick/tdeadmin/debian/control.in
+++ b/ubuntu/maverick/tdeadmin/debian/control.in
@@ -33,8 +33,8 @@ Description: KDE administration documentation in HTML format
  converted to HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /usr/share/doc/kde/HTML/<language>/<app>/, for instance
- /usr/share/doc/kde/HTML/en/kcron/. Documentation is provided for most
+ /usr/share/doc/tde/HTML/<language>/<app>/, for instance
+ /usr/share/doc/tde/HTML/en/kcron/. Documentation is provided for most
  KDE administration packages.
  .
  This package is part of KDE, and a component of the KDE administration
diff --git a/ubuntu/maverick/tdeadmin/debian/kcron-trinity.install b/ubuntu/maverick/tdeadmin/debian/kcron-trinity.install
index 2cdb95088..45ad26a61 100644
--- a/ubuntu/maverick/tdeadmin/debian/kcron-trinity.install
+++ b/ubuntu/maverick/tdeadmin/debian/kcron-trinity.install
@@ -1,14 +1,14 @@
 debian/tmp/opt/trinity/bin/kcron
 debian/tmp/opt/trinity/share/applications/kde/kcron.desktop
 debian/tmp/opt/trinity/share/apps/kcron/kcronui.rc
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcron/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcron/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcron/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcron/kcron.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcron/kcronstart.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcron/newtask.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcron/newvariable.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcron/print.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcron/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcron/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcron/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcron/kcron.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcron/kcronstart.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcron/newtask.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcron/newvariable.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcron/print.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kcron.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kcron.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kcron.png
diff --git a/ubuntu/maverick/tdeadmin/debian/kdat-trinity.install b/ubuntu/maverick/tdeadmin/debian/kdat-trinity.install
index 165bf9f11..2f7665f37 100644
--- a/ubuntu/maverick/tdeadmin/debian/kdat-trinity.install
+++ b/ubuntu/maverick/tdeadmin/debian/kdat-trinity.install
@@ -29,9 +29,9 @@ debian/tmp/opt/trinity/share/apps/kdat/icons/locolor/16x16/apps/kdat_select_some
 debian/tmp/opt/trinity/share/apps/kdat/icons/locolor/16x16/apps/kdat_unmounted.png
 debian/tmp/opt/trinity/share/apps/kdat/icons/locolor/16x16/apps/kdat_verify.png
 debian/tmp/opt/trinity/share/apps/kdat/icons/locolor/32x32/apps/kdat.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdat/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdat/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdat/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdat/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdat/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdat/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kdat.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kdat.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kdat.png
diff --git a/ubuntu/maverick/tdeadmin/debian/knetworkconf-trinity.install b/ubuntu/maverick/tdeadmin/debian/knetworkconf-trinity.install
index 7fe54e136..cd5b1d3b4 100644
--- a/ubuntu/maverick/tdeadmin/debian/knetworkconf-trinity.install
+++ b/ubuntu/maverick/tdeadmin/debian/knetworkconf-trinity.install
@@ -1,17 +1,17 @@
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetworkconf/01.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetworkconf/02.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetworkconf/11.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetworkconf/03.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetworkconf/04.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetworkconf/05.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetworkconf/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetworkconf/06.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetworkconf/07.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetworkconf/about1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetworkconf/08.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetworkconf/09.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetworkconf/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetworkconf/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/01.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/02.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/11.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/03.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/04.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/05.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/06.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/07.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/about1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/08.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/09.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetworkconf/common
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/knetworkconf.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/knetworkconf.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/knetworkconf.png
diff --git a/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.install b/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.install
index 89c5b2c16..20c26fbe0 100644
--- a/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.install
+++ b/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.install
@@ -24,31 +24,31 @@ debian/tmp/opt/trinity/share/apps/kpackage/pics/slack.png
 debian/tmp/opt/trinity/share/apps/kpackage/pics/snew.png
 debian/tmp/opt/trinity/share/apps/kpackage/pics/supdated.png
 debian/tmp/opt/trinity/share/apps/kpackage/pics/tick.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpackage/bsdloc.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpackage/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpackage/debaptloc.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpackage/debloc.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpackage/handle.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpackage/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpackage/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpackage/install.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpackage/left.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpackage/right-change.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpackage/right-files.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpackage/right-prop.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpackage/root-prompt.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpackage/rpmloc.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpackage/slackloc.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpackage/uninstall.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpackage/bsdloc.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpackage/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpackage/debaptloc.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpackage/debloc.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpackage/handle.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpackage/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpackage/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpackage/install.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpackage/left.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpackage/right-change.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpackage/right-files.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpackage/right-prop.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpackage/root-prompt.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpackage/rpmloc.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpackage/slackloc.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpackage/uninstall.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kpackage.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kpackage.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kpackage.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kpackage.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kpackage.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kpackage.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpackage/search.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpackage/searchf.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpackage/searchl.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpackage/search.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpackage/searchf.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpackage/searchl.png
 
 debian/icons/kpackage.xpm		/opt/trinity/share/pixmaps
 debian/icons/kpackage-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdeadmin/debian/ksysv-trinity.install b/ubuntu/maverick/tdeadmin/debian/ksysv-trinity.install
index 4080e649d..10cd19549 100644
--- a/ubuntu/maverick/tdeadmin/debian/ksysv-trinity.install
+++ b/ubuntu/maverick/tdeadmin/debian/ksysv-trinity.install
@@ -6,9 +6,9 @@ debian/tmp/opt/trinity/share/apps/ksysv/pics/ksysv_restart.png
 debian/tmp/opt/trinity/share/apps/ksysv/pics/ksysv_start.png
 debian/tmp/opt/trinity/share/apps/ksysv/pics/ksysv_stop.png
 debian/tmp/opt/trinity/share/apps/ksysv/pics/ksysv_unlocked.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksysv/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksysv/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksysv/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksysv/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksysv/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksysv/index.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/toggle_log.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/ksysv.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/ksysv.png
diff --git a/ubuntu/maverick/tdeadmin/debian/kuser-trinity.install b/ubuntu/maverick/tdeadmin/debian/kuser-trinity.install
index 51a896aa0..a941c76e5 100644
--- a/ubuntu/maverick/tdeadmin/debian/kuser-trinity.install
+++ b/ubuntu/maverick/tdeadmin/debian/kuser-trinity.install
@@ -10,10 +10,10 @@ debian/tmp/opt/trinity/share/apps/kuser/kuserui.rc
 debian/tmp/opt/trinity/share/apps/kuser/pics/group.png
 debian/tmp/opt/trinity/share/apps/kuser/pics/user.png
 debian/tmp/opt/trinity/share/config.kcfg/kuser.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kuser/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kuser/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kuser/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kuser/kuser.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuser/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuser/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuser/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuser/kuser.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kuser.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kuser.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kuser.png
diff --git a/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.install b/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.install
index a56b98960..ca3d4e06e 100644
--- a/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.install
+++ b/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.install
@@ -1,6 +1,6 @@
 debian/tmp/opt/trinity/lib/trinity/kcm_lilo.la
 debian/tmp/opt/trinity/lib/trinity/kcm_lilo.so
 debian/tmp/opt/trinity/share/applications/kde/lilo.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/lilo-config/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/lilo-config/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/lilo-config/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/lilo-config/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/lilo-config/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/lilo-config/common
diff --git a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kcron b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kcron
index 9c4a9007a..2dec1c5ee 100644
--- a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kcron
+++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kcron
@@ -5,6 +5,6 @@ Abstract: Kcron is an application that schedules programs to be run.
 Section: System
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kcron/index.html
-Files: /usr/share/doc/kde/HTML/en/kcron/*.html
+Index: /usr/share/doc/tde/HTML/en/kcron/index.html
+Files: /usr/share/doc/tde/HTML/en/kcron/*.html
 
diff --git a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kdat b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kdat
index f6910c928..927e23227 100644
--- a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kdat
+++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kdat
@@ -5,6 +5,6 @@ Abstract: KDE tape management.
 Section: Admin 
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kdat/index.html
-Files: /usr/share/doc/kde/HTML/en/kdat/*.html
+Index: /usr/share/doc/tde/HTML/en/kdat/index.html
+Files: /usr/share/doc/tde/HTML/en/kdat/*.html
 
diff --git a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf
index 4a8a2da69..134b08805 100644
--- a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf
+++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf
@@ -5,6 +5,6 @@ Abstract: KNetworkConf is a graphical manager for network devices and settings.
 Section: Admin
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/knetworkconf/index.html
-Files: /usr/share/doc/kde/HTML/en/knetworkconf/*.html
+Index: /usr/share/doc/tde/HTML/en/knetworkconf/index.html
+Files: /usr/share/doc/tde/HTML/en/knetworkconf/*.html
 
diff --git a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kpackage b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kpackage
index 87046af71..eb3b6bde6 100644
--- a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kpackage
+++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kpackage
@@ -6,6 +6,6 @@ Abstract: KPackage is a graphical interface to the RPM, Debian,
 Section: Admin
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kpackage/index.html
-Files: /usr/share/doc/kde/HTML/en/kpackage/*.html
+Index: /usr/share/doc/tde/HTML/en/kpackage/index.html
+Files: /usr/share/doc/tde/HTML/en/kpackage/*.html
 
diff --git a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.ksysv b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.ksysv
index 97cdaae29..1ea25aea5 100644
--- a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.ksysv
+++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.ksysv
@@ -5,6 +5,6 @@ Abstract: KSysV is a graphical editor for the SysV style init configuration.
 Section: Admin
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/ksysv/index.html
-Files: /usr/share/doc/kde/HTML/en/ksysv/*.html
+Index: /usr/share/doc/tde/HTML/en/ksysv/index.html
+Files: /usr/share/doc/tde/HTML/en/ksysv/*.html
 
diff --git a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kuser b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kuser
index c3c5e7728..94edc894f 100644
--- a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kuser
+++ b/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kuser
@@ -5,6 +5,6 @@ Abstract: KUser allows you to manage users and groups on your system.
 Section: Admin
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kuser/index.html
-Files: /usr/share/doc/kde/HTML/en/kuser/*.html
+Index: /usr/share/doc/tde/HTML/en/kuser/index.html
+Files: /usr/share/doc/tde/HTML/en/kuser/*.html
 
diff --git a/ubuntu/maverick/tdeartwork/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdeartwork/debian/cdbs/debian-qt-kde.mk
index a5e510758..a4e1eaef5 100644
--- a/ubuntu/maverick/tdeartwork/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdeartwork/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/tdeartwork/debian/cdbs/kde.mk b/ubuntu/maverick/tdeartwork/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/tdeartwork/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdeartwork/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/tdebase/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdebase/debian/cdbs/debian-qt-kde.mk
index 271a018a9..fa0d532f4 100644
--- a/ubuntu/maverick/tdebase/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdebase/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/tdebase/debian/cdbs/kde.mk b/ubuntu/maverick/tdebase/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/tdebase/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdebase/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control
index 10ab6632f..290f52454 100644
--- a/ubuntu/maverick/tdebase/debian/control
+++ b/ubuntu/maverick/tdebase/debian/control
@@ -173,8 +173,8 @@ Description: KDE base documentation in HTML format
  HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /opt/trinity/share/doc/kde/HTML/<language>/<app>/, for instance
- /opt/trinity/share/doc/kde/HTML/en/kate/. Documentation is provided for most
+ /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
+ /opt/trinity/share/doc/tde/HTML/en/kate/. Documentation is provided for most
  KDE base packages.
  .
  This package is part of KDE, and a component of the KDE base module.
diff --git a/ubuntu/maverick/tdebase/debian/control.in b/ubuntu/maverick/tdebase/debian/control.in
index 64def508c..646712aab 100644
--- a/ubuntu/maverick/tdebase/debian/control.in
+++ b/ubuntu/maverick/tdebase/debian/control.in
@@ -152,8 +152,8 @@ Description: KDE base documentation in HTML format
  HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /opt/trinity/share/doc/kde/HTML/<language>/<app>/, for instance
- /opt/trinity/share/doc/kde/HTML/en/kate/. Documentation is provided for most
+ /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
+ /opt/trinity/share/doc/tde/HTML/en/kate/. Documentation is provided for most
  KDE base packages.
  .
  This package is part of KDE, and a component of the KDE base module.
diff --git a/ubuntu/maverick/tdebase/debian/kate-trinity.install b/ubuntu/maverick/tdebase/debian/kate-trinity.install
index 3b65dfabc..275e735e2 100644
--- a/ubuntu/maverick/tdebase/debian/kate-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kate-trinity.install
@@ -35,27 +35,27 @@ debian/tmp/opt/trinity/share/apps/kate/pics/sessionchooser.png
 debian/tmp/opt/trinity/share/apps/kate/tips
 debian/tmp/opt/trinity/share/apps/kconf_update/kate-2.4.upd
 debian/tmp/opt/trinity/share/apps/kwrite/kwriteui.rc
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate/advanced.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate/configdialog01.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate/configdialog02.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate/configuring.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate/fundamentals.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate/highlighted.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate/highlighting.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate/kate.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate/mdi.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate/menus.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate/mimetypechooser.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate/part.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate/plugins.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate/regular-expressions.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kate/unhighlighted.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kwrite/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kwrite/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kwrite/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/advanced.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/configdialog01.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/configdialog02.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/configuring.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/fundamentals.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/highlighted.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/highlighting.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/kate.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/mdi.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/menus.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/mimetypechooser.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/part.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/plugins.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/regular-expressions.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kate/unhighlighted.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwrite/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwrite/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwrite/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kate.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kwrite.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kate.png
diff --git a/ubuntu/maverick/tdebase/debian/kfind-trinity.install b/ubuntu/maverick/tdebase/debian/kfind-trinity.install
index f26a9ba14..88df3e87f 100644
--- a/ubuntu/maverick/tdebase/debian/kfind-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kfind-trinity.install
@@ -9,9 +9,9 @@ debian/tmp/opt/trinity/share/apps/kfindpart/icons/locolor/22x22/actions/info.png
 debian/tmp/opt/trinity/share/apps/kfindpart/icons/locolor/22x22/actions/openfile.png
 debian/tmp/opt/trinity/share/apps/kfindpart/icons/locolor/22x22/actions/save.png
 debian/tmp/opt/trinity/share/apps/kfindpart/icons/locolor/22x22/actions/search.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kfind/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kfind/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kfind/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfind/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfind/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfind/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kfind.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kfind.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kfind.png
diff --git a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install
index 5cf82b23e..ff66000f7 100644
--- a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install
@@ -47,164 +47,164 @@ 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/kde/HTML/en/khelpcenter/background.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/bgtable.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/contact.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/about.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/configkde.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/contrib.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/desktop.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/filemng.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/getkde.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/install.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/intro.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/kdeapps.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/misc.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/moreinfo.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/nonkdeapps.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/notrelated.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/panel.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/qt.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/questions.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/sound.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/tips.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/webbrowse.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/faq/winmng.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/checkxrefs
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/glossary/tdeprintingglossary.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/help.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/kdelogo2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/khelpcenter.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/konq.css
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/lines2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/lines.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/pointers.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/quickstart/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/quickstart/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/quickstart/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/shadow1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/support.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/accessibility.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/amarok-icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/amarok.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/a-window.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/base-kde-applications.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/browser-fine-tuning.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/burning-cds.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/control-center.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/creating-graphics.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/credits-and-license.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/customizing-desktop.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/desktop.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/email.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/extragear-applications.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/file-sharing.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/font-installation.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/getting-help.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/glossary.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/groupware-kontact.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/internet-shortcuts.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/juk-icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/juk.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/kaboodle-icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/kaboodle.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/kcalc-systray.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/kcontrol.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/kde-as-root.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/kde-edutainment.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/kde-for-admins.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/kde-office.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/kmag.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/kmousetool.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/kmouth2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/kmouth3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/kmouth.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/knode-identity.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/knode-mail-account.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/knode-news-account.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/knode-start.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/konq-sidebar.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/konq-simple.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/konsole-intro.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/kopete.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/kppp-dialer-tab.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/kppp-wizard.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/messaging-intro.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/migrator-applications.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/migrator-dictionary.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/net-connection-setup.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/networking-with-windows.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/noatun-icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/noatun.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/oggfolder.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/open-file-dialog.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/panel-and-desktop.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/pdf-files.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/playing-audiocds.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/playing-movies.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/playing-music.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/printer-setup.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/printing-from-apps.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/programs-and-documents.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/programs-controlling.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/removable-disks.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/rip.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/ripsettings.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/screen-captures.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/services.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/shared-sessions.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/splash-screen.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/switching-sessions.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/the-filemanager.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/titlebar-menu.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/troubleshooting-network-x.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/troubleshooting-no-open.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/under-the-hood.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/usenet.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/where-next.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/windows-how-to.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/userguide/your-kde-account.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict10.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict11.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict12.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict13.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict14.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict15.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict16.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict17.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict18.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict19.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict20.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict21.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict22.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict23.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict4.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict5.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict6.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict7.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict8.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/visualdict/pict9.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/welcome.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khelpcenter/whatistde.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
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/contact.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/about.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/configkde.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/contrib.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/desktop.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/filemng.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/getkde.docbook
+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/kdeapps.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/nonkdeapps.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/notrelated.docbook
+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/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
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/glossary/checkxrefs
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/glossary/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/glossary/index.cache.bz2
+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/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/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/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/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-kde-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
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/control-center.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/creating-graphics.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/credits-and-license.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/customizing-desktop.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/desktop.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/email.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/extragear-applications.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/file-sharing.docbook
+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
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/juk-icon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/juk.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kaboodle-icon.png
+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/kde-as-root.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kde-edutainment.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kde-for-admins.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kde-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/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
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/knode-start.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/konq-sidebar.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/konq-simple.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/konsole-intro.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kopete.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kppp-dialer-tab.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kppp-wizard.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/messaging-intro.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/migrator-applications.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/migrator-dictionary.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/net-connection-setup.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/networking-with-windows.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/noatun-icon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/noatun.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/oggfolder.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/open-file-dialog.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/panel-and-desktop.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/pdf-files.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/playing-audiocds.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/playing-movies.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/playing-music.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/printer-setup.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/printing-from-apps.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/programs-and-documents.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/programs-controlling.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/removable-disks.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/rip.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/ripsettings.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/screen-captures.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/services.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/shared-sessions.docbook
+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/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
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/troubleshooting-no-open.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/under-the-hood.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/usenet.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/where-next.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/windows-how-to.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/your-kde-account.docbook
+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/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
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict13.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict14.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict15.png
+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/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
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict6.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict7.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict8.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict9.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/welcome.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/whatistde.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/khelpcenter.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/khelpcenter.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/khelpcenter.png
diff --git a/ubuntu/maverick/tdebase/debian/kicker-trinity.install b/ubuntu/maverick/tdebase/debian/kicker-trinity.install
index c99afee75..ee5993977 100644
--- a/ubuntu/maverick/tdebase/debian/kicker-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kicker-trinity.install
@@ -226,20 +226,20 @@ debian/tmp/opt/trinity/share/autostart/panel.desktop
 debian/tmp/opt/trinity/share/config.kcfg/kickerSettings.kcfg
 debian/tmp/opt/trinity/share/config.kcfg/launcherapplet.kcfg
 debian/tmp/opt/trinity/share/config.kcfg/taskbar.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kicker/bookmarks_icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kicker/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kicker/desktop_icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kicker/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kicker/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kicker/k_menu_icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kicker/printsys_icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kicker/quickbrowser_icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kicker/recent_docs_icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kicker/screenshot_left.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kicker/screenshot_right.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kicker/taskbar_group.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kicker/terminals_icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kicker/windowlist_icon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker/bookmarks_icon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker/desktop_icon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker/k_menu_icon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker/printsys_icon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker/quickbrowser_icon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker/recent_docs_icon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker/screenshot_left.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker/screenshot_right.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker/taskbar_group.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker/terminals_icon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker/windowlist_icon.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/systemtray.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/taskbar.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kbinaryclock.png
diff --git a/ubuntu/maverick/tdebase/debian/klipper-trinity.install b/ubuntu/maverick/tdebase/debian/klipper-trinity.install
index 467dd6710..2e3c456a2 100644
--- a/ubuntu/maverick/tdebase/debian/klipper-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/klipper-trinity.install
@@ -12,10 +12,10 @@ debian/tmp/opt/trinity/share/apps/kconf_update/klipperrc.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/klippershortcuts.upd
 debian/tmp/opt/trinity/share/apps/kicker/applets/klipper.desktop
 debian/tmp/opt/trinity/share/autostart/klipper.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/klipper/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/klipper/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/klipper/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/klipper/screenshot.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/klipper/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/klipper/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/klipper/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/klipper/screenshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/klipper.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/klipper.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/klipper.png
diff --git a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.install b/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.install
index 49711b6e4..05c05cd11 100644
--- a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.install
@@ -21,15 +21,15 @@ debian/tmp/opt/trinity/share/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_
 debian/tmp/opt/trinity/share/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new_sep.png
 debian/tmp/opt/trinity/share/apps/kmenuedit/icons/locolor/16x16/actions/menu_new.png
 debian/tmp/opt/trinity/share/apps/kmenuedit/kmenueditui.rc
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmenuedit/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmenuedit/done.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmenuedit/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmenuedit/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmenuedit/itemname.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmenuedit/kmenueditmain.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmenuedit/new.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmenuedit/selecticon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmenuedit/selectinternet.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/done.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/itemname.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/kmenueditmain.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/new.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/selecticon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/selectinternet.png
 
 debian/icons/kmenuedit.xpm		/opt/trinity/share/pixmaps
 debian/icons/kmenuedit-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.install b/ubuntu/maverick/tdebase/debian/konqueror-trinity.install
index ece23b00f..3fbf16acf 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/konqueror-trinity.install
@@ -167,29 +167,29 @@ debian/tmp/opt/trinity/share/autostart/konqy_preload.desktop
 debian/tmp/opt/trinity/share/config.kcfg/keditbookmarks.kcfg
 debian/tmp/opt/trinity/share/config.kcfg/konq_listview.kcfg
 debian/tmp/opt/trinity/share/config.kcfg/konqueror.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/basics.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/bookmarks.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/browser.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/cmndline.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/commands.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/config.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/credits.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/dirtree.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/dragdrop.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/faq.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/filemanager.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/introduction.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/konqorg.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/parts.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/path-complete.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/plugins.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/save-settings.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/shortcut1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/shortcut2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konqueror/sidebar.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/basics.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/bookmarks.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/browser.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/cmndline.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/commands.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/config.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/credits.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/dirtree.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/dragdrop.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/faq.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/filemanager.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/introduction.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/konqorg.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/parts.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/path-complete.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/plugins.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/save-settings.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/shortcut1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/shortcut2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konqueror/sidebar.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/keditbookmarks.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/keditbookmarks.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/keditbookmarks.png
diff --git a/ubuntu/maverick/tdebase/debian/konsole-trinity.install b/ubuntu/maverick/tdebase/debian/konsole-trinity.install
index 69e1c7699..e5e2fdf6d 100644
--- a/ubuntu/maverick/tdebase/debian/konsole-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/konsole-trinity.install
@@ -71,14 +71,14 @@ debian/tmp/opt/trinity/share/apps/konsole/wallpapers/Paper01.jpg
 debian/tmp/opt/trinity/share/apps/konsole/WhiteOnBlack.schema
 debian/tmp/opt/trinity/share/apps/konsole/x11r5.keytab
 debian/tmp/opt/trinity/share/apps/konsole/XTerm.schema
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmkonsole/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmkonsole/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmkonsole/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konsole/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konsole/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konsole/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konsole/konsole.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konsole/tabbar.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmkonsole/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmkonsole/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmkonsole/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konsole/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konsole/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konsole/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konsole/konsole.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konsole/tabbar.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/konsole.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/konsole.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/konsole.png
diff --git a/ubuntu/maverick/tdebase/debian/kpager-trinity.install b/ubuntu/maverick/tdebase/debian/kpager-trinity.install
index 4c1018654..d9a0bb1ce 100644
--- a/ubuntu/maverick/tdebase/debian/kpager-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kpager-trinity.install
@@ -1,11 +1,11 @@
 debian/tmp/opt/trinity/bin/kpager
 debian/tmp/opt/trinity/share/applications/kde/kpager.desktop
 debian/tmp/opt/trinity/share/applnk/Utilities/kpager.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpager/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpager/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpager/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpager/screenshot.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpager/settings.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpager/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpager/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpager/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpager/screenshot.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpager/settings.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kpager.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kpager.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kpager.png
diff --git a/ubuntu/maverick/tdebase/debian/ksplash-trinity.install b/ubuntu/maverick/tdebase/debian/ksplash-trinity.install
index 6865911fd..847b02505 100644
--- a/ubuntu/maverick/tdebase/debian/ksplash-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/ksplash-trinity.install
@@ -40,9 +40,9 @@ debian/tmp/opt/trinity/share/apps/ksplash/Themes/Simple/Preview.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Simple/Theme.rc
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Standard/Preview.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Standard/Theme.rc
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksplashml/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksplashml/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksplashml/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksplashml/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksplashml/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksplashml/index.docbook
 debian/tmp/opt/trinity/share/services/ksplashdefault.desktop
 debian/tmp/opt/trinity/share/services/ksplash.desktop
 debian/tmp/opt/trinity/share/services/ksplashunified.desktop
diff --git a/ubuntu/maverick/tdebase/debian/ksysguard-trinity.install b/ubuntu/maverick/tdebase/debian/ksysguard-trinity.install
index 34702ed3f..54649197d 100644
--- a/ubuntu/maverick/tdebase/debian/ksysguard-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/ksysguard-trinity.install
@@ -22,9 +22,9 @@ debian/tmp/opt/trinity/share/apps/ksysguard/pics/waiting.png
 debian/tmp/opt/trinity/share/apps/ksysguard/pics/X.png
 debian/tmp/opt/trinity/share/apps/ksysguard/ProcessTable.sgrd
 debian/tmp/opt/trinity/share/apps/ksysguard/SystemLoad.sgrd
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksysguard/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksysguard/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksysguard/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksysguard/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksysguard/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksysguard/index.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/ksysguard.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/ksysguard.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/ksysguard.png
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
index 773979ca7..9ac6769ea 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
@@ -130,204 +130,204 @@ debian/tmp/opt/trinity/share/apps/kthememanager/themes/YellowOnBlue-big/YellowOn
 debian/tmp/opt/trinity/share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml
 debian/tmp/opt/trinity/share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png
 debian/tmp/opt/trinity/share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/arts/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/arts/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/arts/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/arts/midi.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/background/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/background/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/background/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/bell/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/bell/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/bell/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/cache/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/cache/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/cache/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/clock/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/clock/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/clock/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/colors/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/colors/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/colors/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/cookies/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/cookies/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/cookies/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/crypto/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/crypto/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/crypto/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/desktopbehavior/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/desktopbehavior/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/desktopbehavior/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/desktop/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/desktop/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/desktop/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/ebrowsing/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/ebrowsing/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/ebrowsing/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/email/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/email/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/email/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/energy/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/energy/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/energy/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/filemanager/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/filemanager/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/filemanager/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/filemanager/kfileman1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/filemanager/kfileman2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/filetypes/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/filetypes/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/filetypes/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/fonts/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/fonts/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/fonts/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/helpindex.html/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/helpindex.html/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/helpindex.html/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/icons/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/icons/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/icons/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmaccess/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmaccess/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmaccess/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmcss/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmcss/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmcss/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmfontinst/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmfontinst/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmfontinst/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmlaunch/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmlaunch/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmlaunch/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmnotify/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmnotify/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmnotify/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmsmserver/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmsmserver/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmsmserver/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmstyle/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmstyle/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmstyle/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmtaskbar/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmtaskbar/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmtaskbar/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/tdm/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/tdm/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/tdm/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/keyboard/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/keyboard/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/keyboard/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/keys/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/keys/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/keys/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/khtml/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/khtml/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/khtml/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/khtml/nsplugin.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/twindecoration/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/twindecoration/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/twindecoration/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/language/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/language/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/language/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/mouse/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/mouse/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/mouse/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/netpref/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/netpref/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/netpref/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/panelappearance/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/panelappearance/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/panelappearance/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/panel/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/panel/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/panel/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/passwords/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/passwords/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/passwords/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/performance/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/performance/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/performance/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/proxy/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/proxy/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/proxy/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/proxy/socks.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/screensaver/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/screensaver/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/screensaver/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/screenshot.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/smb/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/smb/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/smb/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/spellchecking/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/spellchecking/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/spellchecking/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/useragent/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/useragent/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/useragent/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/windowmanagement/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/windowmanagement/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/windowmanagement/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/cdinfo/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/cdinfo/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/cdinfo/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/devices/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/devices/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/devices/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/dma/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/dma/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/dma/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/interrupts/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/interrupts/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/interrupts/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/ioports/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/ioports/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/ioports/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/memory/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/memory/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/memory/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/nics/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/nics/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/nics/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/opengl/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/opengl/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/opengl/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/partitions/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/partitions/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/partitions/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/pci/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/pci/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/pci/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/pcmcia/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/pcmcia/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/pcmcia/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/processor/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/processor/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/processor/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/protocols/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/protocols/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/protocols/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/samba/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/samba/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/samba/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/scsi/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/scsi/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/scsi/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/sound/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/sound/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/sound/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/usb/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/usb/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/usb/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/xserver/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/xserver/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/xserver/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/arts/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/arts/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/arts/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/arts/midi.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/background/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/background/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/background/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/bell/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/bell/index.cache.bz2
+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/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
+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/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/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
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filemanager/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filemanager/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filemanager/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filemanager/kfileman1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filemanager/kfileman2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filetypes/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filetypes/index.cache.bz2
+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/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/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/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/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
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmnotify/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmnotify/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmnotify/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmsmserver/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmsmserver/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmsmserver/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmstyle/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmstyle/index.cache.bz2
+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/khtml/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khtml/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/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/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/kinfocenter/cdinfo/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/index.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/access.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/acroread.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/applixware.png
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kate b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kate
index d860c2a6b..20d6092ad 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kate
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kate
@@ -5,6 +5,6 @@ Abstract: Kate is a programmer's text editor for KDE.
 Section: Apps/Text
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kate/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kate/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kate/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kate/*.html
 
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kfind b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kfind
index 4c200abb0..c377acfcf 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kfind
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kfind
@@ -5,6 +5,6 @@ Abstract: This Handbook describes KFind, KDE's file find utility.
 Section: Apps/Utils
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kfind/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kfind/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kfind/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kfind/*.html
 
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kicker b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kicker
index 1ea4077e1..d5f032b13 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kicker
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kicker
@@ -6,6 +6,6 @@ Abstract: Kicker is the KDE application starter panel and is also capable of
 Section: Apps/Utils
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kicker/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kicker/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kicker/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kicker/*.html
 
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.klipper b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.klipper
index 7c47c1b94..80d62407b 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.klipper
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.klipper
@@ -5,6 +5,6 @@ Abstract: Klipper is the KDE clipboard cut and paste utility.
 Section: Apps/Utils
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/klipper/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/klipper/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/klipper/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/klipper/*.html
 
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kmenuedit b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kmenuedit
index d7687a116..7e7f914fe 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kmenuedit
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kmenuedit
@@ -5,6 +5,6 @@ Abstract: KMenuEdit allows the editing of the KDE main menu.
 Section: Apps/System
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kmenuedit/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kmenuedit/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kmenuedit/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kmenuedit/*.html
 
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.konqueror b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.konqueror
index 96659a805..9b2d006b1 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.konqueror
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.konqueror
@@ -6,6 +6,6 @@ Abstract: Konqueror is KDE's advanced File Manager, Web Browser and
 Section: Apps/Tools
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/konqueror/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/konqueror/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/konqueror/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/konqueror/*.html
 
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.konsole b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.konsole
index 705cf549c..766fee9cf 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.konsole
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.konsole
@@ -5,6 +5,6 @@ Abstract: Konsole is an X terminal emulator for KDE.
 Section: Xshells 
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/konsole/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/konsole/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/konsole/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/konsole/*.html
 
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kpager b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kpager
index 5b245384e..a5b5a8e19 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kpager
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kpager
@@ -7,6 +7,6 @@ Abstract: KPager gives you a thumbnail sketch of all your desktops. It is a hand
 Section: Apps/Utils
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kpager/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kpager/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpager/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpager/*.html
 
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.ksysguard b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.ksysguard
index fb1ba8487..05b35a51f 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.ksysguard
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.ksysguard
@@ -6,6 +6,6 @@ Abstract: KSysGuard is a network enabled task manager and system monitor
 Section: Apps/System
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/ksysguard/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/ksysguard/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/ksysguard/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/ksysguard/*.html
 
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdeprint b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdeprint
index 7610a4313..4ce4ca6ec 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdeprint
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdeprint
@@ -5,6 +5,6 @@ Abstract: KDEPrint is the official printing system of KDE.
 Section: Apps/Tools 
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/tdeprint/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/tdeprint/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/tdeprint/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/tdeprint/*.html
 
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdm b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdm
index 4be02569c..9ee99f8b4 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdm
+++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdm
@@ -5,6 +5,6 @@ Abstract: This document describes TDM, the KDE Display Manager, an X session man
 Section: System 
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/tdm/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/tdm/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/tdm/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/tdm/*.html
 
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.install
index 962755e39..b148601c3 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-kio-plugins-trinity.install
@@ -96,48 +96,48 @@ debian/tmp/opt/trinity/share/apps/systemview/media.desktop
 debian/tmp/opt/trinity/share/apps/systemview/remote.desktop
 debian/tmp/opt/trinity/share/apps/systemview/users.desktop
 debian/tmp/opt/trinity/share/config.kcfg/mediamanagersettings.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/bzip.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/bzip2.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/cgi.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/data.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/file.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/finger.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/fish.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/floppy.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/ftp.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/gopher.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/gzip.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/help.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/http.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/https.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/imap.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/imaps.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/info.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/lan.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/ldap.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/mac.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/mailto.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/man.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/mrml.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/news.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/nfs.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/nntp.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/pop3.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/pop3s.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/print.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/rlan.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/rlogin.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/sftp.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/smb.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/smtp.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/tar.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/telnet.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/thumbnail.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/webdav.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/webdavs.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/bzip.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/bzip2.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/cgi.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/data.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/file.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/finger.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/fish.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/floppy.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/ftp.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/gopher.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/gzip.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/help.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/http.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/https.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/imap.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/imaps.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/info.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/lan.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/ldap.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/mac.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/mailto.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/man.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/mrml.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/news.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/nfs.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/nntp.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/pop3.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/pop3s.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/print.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/rlan.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/rlogin.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/sftp.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/smb.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/smtp.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/tar.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/telnet.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/thumbnail.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/webdav.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/webdavs.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/compact_flash_mount_decrypt.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/compact_flash_unmount_decrypt.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/compact_flash_unmount_encrypt.png
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install
index b90f777a8..40deb0f83 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install
@@ -69,28 +69,28 @@ debian/tmp/opt/trinity/share/apps/kdcop/kdcopui.rc
 debian/tmp/opt/trinity/share/apps/khotkeys/trinity2b1.khotkeys
 debian/tmp/opt/trinity/share/apps/khotkeys/konqueror_gestures_trinity21.khotkeys
 debian/tmp/opt/trinity/share/apps/khotkeys/printscreen.khotkeys
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdcop/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdcop/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdcop/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdebugdialog/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdebugdialog/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdebugdialog/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesu/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesu/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesu/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetattach/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetattach/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetattach/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetattach/screenshot1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetattach/screenshot2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetattach/screenshot3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetattach/screenshot4.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knetattach/screenshot.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kxkb/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kxkb/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kxkb/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kxkb/layout.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kxkb/switching.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kxkb/xkb.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdebugdialog/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdebugdialog/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdebugdialog/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesu/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesu/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesu/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetattach/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetattach/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetattach/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetattach/screenshot1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetattach/screenshot2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetattach/screenshot3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetattach/screenshot4.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knetattach/screenshot.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/layout.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/switching.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/xkb.png
 debian/tmp/opt/trinity/share/services/kded/khotkeys.desktop
 debian/tmp/opt/trinity/share/services/kxkb.desktop
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-doc.install b/ubuntu/maverick/tdebase/debian/tdebase-trinity-doc.install
index 60f6072d3..e286a6891 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-doc.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-doc.install
@@ -1 +1 @@
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdebase-apidocs/*
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdebase-apidocs/*
diff --git a/ubuntu/maverick/tdebase/debian/tdeprint-trinity.install b/ubuntu/maverick/tdebase/debian/tdeprint-trinity.install
index 69f67a958..5539be8f2 100644
--- a/ubuntu/maverick/tdebase/debian/tdeprint-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdeprint-trinity.install
@@ -51,65 +51,65 @@ debian/tmp/opt/trinity/share/apps/tdeprint/template/top-left.png
 debian/tmp/opt/trinity/share/apps/tdeprint/template/top-middle.png
 debian/tmp/opt/trinity/share/apps/tdeprint/template/top-right-tdeprint.png
 debian/tmp/opt/trinity/share/apps/kjobviewer/kjobviewerui.rc
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/add-printer-wiz.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cr32-action-wizard.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard2_backendselection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard3_networkscan.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard3_networkscan_results.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsaddprinterwizard4_networkscan_config.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cups-config.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsoptions.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfig_browse_relay_add_button.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfig_browsingmasks_add_button.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration10_browsinggeneral.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration11_browsingconnections.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration11_browsingmasks.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration12_browsingtimeouts.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration14_browsingrelay.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration1_welcome.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration2_general.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration3_logging.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration4_directories.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration5_HTTP.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration6_encryption.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration7_miscellanious.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration8_networkgeneral.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration9_networkclients.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminaccessmasks.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminaddprinters.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminauthorization.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/cupsserverconfiguration_securityoverview.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/extensions.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/external-command.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/final-word.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/getting-started.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/highlights.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kcontrolcenter-printmanager-jobcontrol-2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kcontrol-icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kcron_to_be_printed.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/tdeprint-jobviewer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter-as-netscape-printcommand.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter_called_from_run_command.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter-kivio.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/kprinter_with_kcron_developer_special.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/lpd.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/lpr-bsd.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/lprng.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/ps-boxes.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/rlpr.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/steinbruch_scaled.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/tech-overview.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeprint/theory.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/add-printer-wiz.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cr32-action-wizard.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsaddprinterwizard1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsaddprinterwizard2_backendselection.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsaddprinterwizard3_networkscan.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsaddprinterwizard3_networkscan_results.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsaddprinterwizard4_networkscan_config.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cups-config.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsoptions.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfig_browse_relay_add_button.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfig_browsingmasks_add_button.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration10_browsinggeneral.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration11_browsingconnections.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration11_browsingmasks.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration12_browsingtimeouts.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration14_browsingrelay.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration1_welcome.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration2_general.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration3_logging.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration4_directories.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration5_HTTP.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration6_encryption.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration7_miscellanious.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration8_networkgeneral.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration9_networkclients.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminaccessmasks.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminaddprinters.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration_resourceadminauthorization.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/cupsserverconfiguration_securityoverview.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/extensions.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/external-command.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/final-word.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/getting-started.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/highlights.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/kcontrolcenter-printmanager-jobcontrol-2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/kcontrol-icon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/kcron_to_be_printed.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/tdeprint-jobviewer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/kprinter-as-netscape-printcommand.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/kprinter_called_from_run_command.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/kprinter-kivio.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/kprinter.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/kprinter_with_kcron_developer_special.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/lpd.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/lpr-bsd.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/lprng.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/ps-boxes.png
+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/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 fd1aff663..5ec933662 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.install
@@ -44,7 +44,7 @@ debian/tmp/opt/trinity/share/apps/tdm/themes/circles/help.png
 debian/tmp/opt/trinity/share/apps/tdm/themes/circles/options.png
 debian/tmp/opt/trinity/share/apps/tdm/themes/circles/screenshot.png
 debian/tmp/opt/trinity/share/apps/tdm/themes/o2_enterprise
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdm/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdm/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdm/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdm/tdmrc-ref.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/tdmrc-ref.docbook
diff --git a/ubuntu/maverick/tdebase/debian/twin-trinity.install b/ubuntu/maverick/tdebase/debian/twin-trinity.install
index 242592b17..452b1e542 100644
--- a/ubuntu/maverick/tdebase/debian/twin-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/twin-trinity.install
@@ -93,9 +93,9 @@ debian/tmp/opt/trinity/share/apps/twin/quartz.desktop
 debian/tmp/opt/trinity/share/apps/twin/redmond.desktop
 debian/tmp/opt/trinity/share/apps/twin/web.desktop
 debian/tmp/opt/trinity/share/config.kcfg/twin.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompmgr/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompmgr/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompmgr/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kompmgr/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kompmgr/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kompmgr/index.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/twin.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/twin.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/twin.png
diff --git a/ubuntu/maverick/tdebindings/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdebindings/debian/cdbs/debian-qt-kde.mk
index 922c1eeac..2a219d60a 100644
--- a/ubuntu/maverick/tdebindings/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdebindings/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/usr/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
-		/usr/trinity/bin/meinproc $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/tde/HTML/en/$$pkg; \
+		/usr/trinity/bin/meinproc $(DEB_DESTDIR)/usr/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/tdebindings/debian/cdbs/kde.mk b/ubuntu/maverick/tdebindings/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/tdebindings/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdebindings/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.install b/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.install
index d67dd9d4f..0b068bc53 100644
--- a/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.install
+++ b/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.install
@@ -1,2 +1,2 @@
 debian/tmp/opt/trinity/share/java/qtjava*.jar
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/javalib/*.html /opt/trinity/share/doc/libqt3-java-trinity/html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/javalib/*.html /opt/trinity/share/doc/libqt3-java-trinity/html
diff --git a/ubuntu/maverick/tdeedu/debian/blinken-trinity.install b/ubuntu/maverick/tdeedu/debian/blinken-trinity.install
index fae559882..b0a94f4f2 100644
--- a/ubuntu/maverick/tdeedu/debian/blinken-trinity.install
+++ b/ubuntu/maverick/tdeedu/debian/blinken-trinity.install
@@ -3,7 +3,7 @@ opt/trinity/bin/blinken
 /opt/trinity/share/apps/blinken/images
 /opt/trinity/share/apps/blinken/sounds
 /opt/trinity/share/config.kcfg/blinken.kcfg
-/opt/trinity/share/doc/kde/HTML/en/blinken
+/opt/trinity/share/doc/tde/HTML/en/blinken
 /opt/trinity/share/icons/hicolor/16x16/apps/blinken.png
 /opt/trinity/share/icons/hicolor/22x22/apps/blinken.png
 /opt/trinity/share/icons/hicolor/32x32/apps/blinken.png
diff --git a/ubuntu/maverick/tdeedu/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdeedu/debian/cdbs/debian-qt-kde.mk
index cae625265..d135c4257 100644
--- a/ubuntu/maverick/tdeedu/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdeedu/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/tdeedu/debian/cdbs/kde.mk b/ubuntu/maverick/tdeedu/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/tdeedu/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdeedu/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/tdeedu/debian/changelog b/ubuntu/maverick/tdeedu/debian/changelog
index 4850c6255..3d8b1f5aa 100644
--- a/ubuntu/maverick/tdeedu/debian/changelog
+++ b/ubuntu/maverick/tdeedu/debian/changelog
@@ -569,7 +569,7 @@ tdeedu (4:3.3.2-1) unstable; urgency=low
 
 tdeedu (4:3.4.0-0ubuntu1) hoary; urgency=low
 
-  * Add directory /opt/trinity/share/doc/kde/HTML/en/flashkard to tdeedu-doc-html
+  * Add directory /opt/trinity/share/doc/tde/HTML/en/flashkard to tdeedu-doc-html
     to prevent .dhelp problem.
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 18:35:25 +0000
diff --git a/ubuntu/maverick/tdeedu/debian/control b/ubuntu/maverick/tdeedu/debian/control
index a8afe7c5a..312a96045 100644
--- a/ubuntu/maverick/tdeedu/debian/control
+++ b/ubuntu/maverick/tdeedu/debian/control
@@ -62,8 +62,8 @@ Description: Trinity edutainment documentation in HTML format
  to HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /opt/trinity/share/doc/kde/HTML/<language>/<app>/, for instance
- /opt/trinity/share/doc/kde/HTML/en/kalzium/. Documentation is provided for
+ /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
+ /opt/trinity/share/doc/tde/HTML/en/kalzium/. Documentation is provided for
  most KDE educational packages.
  .
  This package is part of Trinity, as a component of the KDE education module.
diff --git a/ubuntu/maverick/tdeedu/debian/control.in b/ubuntu/maverick/tdeedu/debian/control.in
index 020c34ea1..0763ee2a6 100644
--- a/ubuntu/maverick/tdeedu/debian/control.in
+++ b/ubuntu/maverick/tdeedu/debian/control.in
@@ -54,8 +54,8 @@ Description: KDE edutainment documentation in HTML format
  to HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /opt/trinity/share/doc/kde/HTML/<language>/<app>/, for instance
- /opt/trinity/share/doc/kde/HTML/en/kalzium/. Documentation is provided for
+ /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
+ /opt/trinity/share/doc/tde/HTML/en/kalzium/. Documentation is provided for
  most KDE educational packages.
  .
  This package is part of KDE, as a component of the KDE education module.
diff --git a/ubuntu/maverick/tdeedu/debian/kalzium-trinity.install b/ubuntu/maverick/tdeedu/debian/kalzium-trinity.install
index fd15464a3..9b9bca470 100644
--- a/ubuntu/maverick/tdeedu/debian/kalzium-trinity.install
+++ b/ubuntu/maverick/tdeedu/debian/kalzium-trinity.install
@@ -1,10 +1,10 @@
 opt/trinity/bin/kalzium
 /opt/trinity/share/applications/kde/kalzium.desktop
 /opt/trinity/share/config.kcfg/kalzium.kcfg
-/opt/trinity/share/doc/kde/HTML/en/kalzium/common
-/opt/trinity/share/doc/kde/HTML/en/kalzium/index.cache.bz2
-/opt/trinity/share/doc/kde/HTML/en/kalzium/*.docbook
-/opt/trinity/share/doc/kde/HTML/en/kalzium/*.png
+/opt/trinity/share/doc/tde/HTML/en/kalzium/common
+/opt/trinity/share/doc/tde/HTML/en/kalzium/index.cache.bz2
+/opt/trinity/share/doc/tde/HTML/en/kalzium/*.docbook
+/opt/trinity/share/doc/tde/HTML/en/kalzium/*.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kalzium.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kalzium.png
 /opt/trinity/share/icons/hicolor/32x32/apps/kalzium.png
diff --git a/ubuntu/maverick/tdeedu/debian/kanagram-trinity.install b/ubuntu/maverick/tdeedu/debian/kanagram-trinity.install
index c530f90f3..4793db665 100644
--- a/ubuntu/maverick/tdeedu/debian/kanagram-trinity.install
+++ b/ubuntu/maverick/tdeedu/debian/kanagram-trinity.install
@@ -2,11 +2,11 @@ opt/trinity/bin/kanagram
 /opt/trinity/share/applications/kde/kanagram.desktop
 /opt/trinity/share/apps/kanagram
 /opt/trinity/share/config.kcfg/kanagram.kcfg
-/opt/trinity/share/doc/kde/HTML/en/kanagram/common
-/opt/trinity/share/doc/kde/HTML/en/kanagram/index.cache.bz2
-/opt/trinity/share/doc/kde/HTML/en/kanagram/*.docbook
-/opt/trinity/share/doc/kde/HTML/en/kanagram/*.png
-/opt/trinity/share/doc/kde/HTML/en/kanagram/*.svgz
+/opt/trinity/share/doc/tde/HTML/en/kanagram/common
+/opt/trinity/share/doc/tde/HTML/en/kanagram/index.cache.bz2
+/opt/trinity/share/doc/tde/HTML/en/kanagram/*.docbook
+/opt/trinity/share/doc/tde/HTML/en/kanagram/*.png
+/opt/trinity/share/doc/tde/HTML/en/kanagram/*.svgz
 /opt/trinity/share/icons/hicolor/16x16/apps/kanagram.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kanagram.png
 /opt/trinity/share/icons/hicolor/32x32/apps/kanagram.png
diff --git a/ubuntu/maverick/tdeedu/debian/kbruch-trinity.install b/ubuntu/maverick/tdeedu/debian/kbruch-trinity.install
index 70f5707a9..e32bda253 100644
--- a/ubuntu/maverick/tdeedu/debian/kbruch-trinity.install
+++ b/ubuntu/maverick/tdeedu/debian/kbruch-trinity.install
@@ -2,10 +2,10 @@ opt/trinity/bin/kbruch
 /opt/trinity/share/apps/kbruch/kbruchui.rc
 /opt/trinity/share/applications/kde/kbruch.desktop
 /opt/trinity/share/config.kcfg/kbruch.kcfg
-/opt/trinity/share/doc/kde/HTML/en/kbruch/*.bz2
-/opt/trinity/share/doc/kde/HTML/en/kbruch/common
-/opt/trinity/share/doc/kde/HTML/en/kbruch/*.docbook
-/opt/trinity/share/doc/kde/HTML/en/kbruch/*.png
+/opt/trinity/share/doc/tde/HTML/en/kbruch/*.bz2
+/opt/trinity/share/doc/tde/HTML/en/kbruch/common
+/opt/trinity/share/doc/tde/HTML/en/kbruch/*.docbook
+/opt/trinity/share/doc/tde/HTML/en/kbruch/*.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kbruch.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kbruch.png
 /opt/trinity/share/icons/hicolor/32x32/apps/kbruch.png
diff --git a/ubuntu/maverick/tdeedu/debian/keduca-trinity.install b/ubuntu/maverick/tdeedu/debian/keduca-trinity.install
index 405435bf2..10264f55f 100644
--- a/ubuntu/maverick/tdeedu/debian/keduca-trinity.install
+++ b/ubuntu/maverick/tdeedu/debian/keduca-trinity.install
@@ -6,10 +6,10 @@ opt/trinity/lib/trinity/libkeducapart.so
 /opt/trinity/share/applications/kde/keducabuilder.desktop
 /opt/trinity/share/apps/keduca
 /opt/trinity/share/config.kcfg/keduca.kcfg
-/opt/trinity/share/doc/kde/HTML/en/keduca/common
-/opt/trinity/share/doc/kde/HTML/en/keduca/index.cache.bz2
-/opt/trinity/share/doc/kde/HTML/en/keduca/*.docbook
-/opt/trinity/share/doc/kde/HTML/en/keduca/*.png
+/opt/trinity/share/doc/tde/HTML/en/keduca/common
+/opt/trinity/share/doc/tde/HTML/en/keduca/index.cache.bz2
+/opt/trinity/share/doc/tde/HTML/en/keduca/*.docbook
+/opt/trinity/share/doc/tde/HTML/en/keduca/*.png
 /opt/trinity/share/icons/hicolor/16x16/apps/keduca.png
 /opt/trinity/share/icons/hicolor/22x22/apps/keduca.png
 /opt/trinity/share/icons/hicolor/32x32/apps/keduca.png
diff --git a/ubuntu/maverick/tdeedu/debian/kgeography-trinity.install b/ubuntu/maverick/tdeedu/debian/kgeography-trinity.install
index 53130eeec..01bde9d25 100644
--- a/ubuntu/maverick/tdeedu/debian/kgeography-trinity.install
+++ b/ubuntu/maverick/tdeedu/debian/kgeography-trinity.install
@@ -1,7 +1,7 @@
 opt/trinity/bin/kgeography
 /opt/trinity/share/applications/kde/kgeography.desktop
 /opt/trinity/share/config.kcfg/kgeography.kcfg
-/opt/trinity/share/doc/kde/HTML/en/kgeography
+/opt/trinity/share/doc/tde/HTML/en/kgeography
 /opt/trinity/share/icons/crystalsvg/128x128/apps/kgeography.png
 /opt/trinity/share/icons/crystalsvg/16x16/apps/kgeography.png
 /opt/trinity/share/icons/crystalsvg/22x22/apps/kgeography.png
diff --git a/ubuntu/maverick/tdeedu/debian/khangman-trinity.install b/ubuntu/maverick/tdeedu/debian/khangman-trinity.install
index c22f69d14..2047c5ecb 100644
--- a/ubuntu/maverick/tdeedu/debian/khangman-trinity.install
+++ b/ubuntu/maverick/tdeedu/debian/khangman-trinity.install
@@ -6,10 +6,10 @@ opt/trinity/bin/khangman
 /opt/trinity/share/apps/khangman/pics
 /opt/trinity/share/apps/khangman/sounds
 /opt/trinity/share/config.kcfg/khangman.kcfg
-/opt/trinity/share/doc/kde/HTML/en/khangman/common
-/opt/trinity/share/doc/kde/HTML/en/khangman/index.cache.bz2
-/opt/trinity/share/doc/kde/HTML/en/khangman/*.docbook
-/opt/trinity/share/doc/kde/HTML/en/khangman/*.png
+/opt/trinity/share/doc/tde/HTML/en/khangman/common
+/opt/trinity/share/doc/tde/HTML/en/khangman/index.cache.bz2
+/opt/trinity/share/doc/tde/HTML/en/khangman/*.docbook
+/opt/trinity/share/doc/tde/HTML/en/khangman/*.png
 /opt/trinity/share/icons/hicolor/16x16/apps/khangman.png
 /opt/trinity/share/icons/hicolor/22x22/apps/khangman.png
 /opt/trinity/share/icons/hicolor/32x32/apps/khangman.png
diff --git a/ubuntu/maverick/tdeedu/debian/kig-trinity.install b/ubuntu/maverick/tdeedu/debian/kig-trinity.install
index a7c1ae6c1..55a817ea8 100644
--- a/ubuntu/maverick/tdeedu/debian/kig-trinity.install
+++ b/ubuntu/maverick/tdeedu/debian/kig-trinity.install
@@ -11,11 +11,11 @@ opt/trinity/lib/trinity/libkigpart.so
 /opt/trinity/share/applications/kde/kig.desktop
 /opt/trinity/share/apps/katepart/syntax/python-kig.xml
 /opt/trinity/share/apps/kig
-/opt/trinity/share/doc/kde/HTML/en/kig/*.bz2
-/opt/trinity/share/doc/kde/HTML/en/kig/common
-/opt/trinity/share/doc/kde/HTML/en/kig/*.docbook
-/opt/trinity/share/doc/kde/HTML/en/kig/*.png
-/opt/trinity/share/doc/kde/HTML/en/kig/scripting-api/*
+/opt/trinity/share/doc/tde/HTML/en/kig/*.bz2
+/opt/trinity/share/doc/tde/HTML/en/kig/common
+/opt/trinity/share/doc/tde/HTML/en/kig/*.docbook
+/opt/trinity/share/doc/tde/HTML/en/kig/*.png
+/opt/trinity/share/doc/tde/HTML/en/kig/scripting-api/*
 /opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kig_doc.png
 /opt/trinity/share/icons/crystalsvg/22x22/mimetypes/kig_doc.png
 /opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kig_doc.png
diff --git a/ubuntu/maverick/tdeedu/debian/kiten-trinity.install b/ubuntu/maverick/tdeedu/debian/kiten-trinity.install
index c208af928..652f08bde 100644
--- a/ubuntu/maverick/tdeedu/debian/kiten-trinity.install
+++ b/ubuntu/maverick/tdeedu/debian/kiten-trinity.install
@@ -1,10 +1,10 @@
 opt/trinity/bin/kiten
 opt/trinity/bin/kitengen
 /opt/trinity/share/applications/kde/kiten.desktop
-/opt/trinity/share/doc/kde/HTML/en/kiten/common
-/opt/trinity/share/doc/kde/HTML/en/kiten/index.cache.bz2
-/opt/trinity/share/doc/kde/HTML/en/kiten/*.docbook
-/opt/trinity/share/doc/kde/HTML/en/kiten/*.png
+/opt/trinity/share/doc/tde/HTML/en/kiten/common
+/opt/trinity/share/doc/tde/HTML/en/kiten/index.cache.bz2
+/opt/trinity/share/doc/tde/HTML/en/kiten/*.docbook
+/opt/trinity/share/doc/tde/HTML/en/kiten/*.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kiten.png
 /opt/trinity/share/icons/hicolor/32x32/apps/kiten.png
 /opt/trinity/share/icons/hicolor/48x48/apps/kiten.png
diff --git a/ubuntu/maverick/tdeedu/debian/klatin-trinity.install b/ubuntu/maverick/tdeedu/debian/klatin-trinity.install
index 5c0bb4757..239a231f0 100644
--- a/ubuntu/maverick/tdeedu/debian/klatin-trinity.install
+++ b/ubuntu/maverick/tdeedu/debian/klatin-trinity.install
@@ -2,11 +2,11 @@ opt/trinity/bin/klatin
 /opt/trinity/share/applications/kde/klatin.desktop
 /opt/trinity/share/apps/klatin
 /opt/trinity/share/config.kcfg/klatin.kcfg
-/opt/trinity/share/doc/kde/HTML/en/klatin/*.bz2
-/opt/trinity/share/doc/kde/HTML/en/klatin/common
-/opt/trinity/share/doc/kde/HTML/en/klatin/*.docbook
-/opt/trinity/share/doc/kde/HTML/en/klatin/*.png
-/opt/trinity/share/doc/kde/HTML/en/klatin/README
+/opt/trinity/share/doc/tde/HTML/en/klatin/*.bz2
+/opt/trinity/share/doc/tde/HTML/en/klatin/common
+/opt/trinity/share/doc/tde/HTML/en/klatin/*.docbook
+/opt/trinity/share/doc/tde/HTML/en/klatin/*.png
+/opt/trinity/share/doc/tde/HTML/en/klatin/README
 /opt/trinity/share/icons/hicolor/16x16/apps/klatin.png
 /opt/trinity/share/icons/hicolor/22x22/apps/klatin.png
 /opt/trinity/share/icons/hicolor/32x32/apps/klatin.png
diff --git a/ubuntu/maverick/tdeedu/debian/klettres-trinity.install b/ubuntu/maverick/tdeedu/debian/klettres-trinity.install
index 4dc6e277a..793cc5d84 100644
--- a/ubuntu/maverick/tdeedu/debian/klettres-trinity.install
+++ b/ubuntu/maverick/tdeedu/debian/klettres-trinity.install
@@ -2,10 +2,10 @@ etc/trinity/klettresrc
 opt/trinity/bin/klettres
 /opt/trinity/share/applications/kde/klettres.desktop
 /opt/trinity/share/config.kcfg/klettres.kcfg
-/opt/trinity/share/doc/kde/HTML/en/klettres/common
-/opt/trinity/share/doc/kde/HTML/en/klettres/index.cache.bz2
-/opt/trinity/share/doc/kde/HTML/en/klettres/*.docbook
-/opt/trinity/share/doc/kde/HTML/en/klettres/*.png
+/opt/trinity/share/doc/tde/HTML/en/klettres/common
+/opt/trinity/share/doc/tde/HTML/en/klettres/index.cache.bz2
+/opt/trinity/share/doc/tde/HTML/en/klettres/*.docbook
+/opt/trinity/share/doc/tde/HTML/en/klettres/*.png
 /opt/trinity/share/icons/hicolor/16x16/apps/klettres.png
 /opt/trinity/share/icons/hicolor/22x22/apps/klettres.png
 /opt/trinity/share/icons/hicolor/32x32/apps/klettres.png
diff --git a/ubuntu/maverick/tdeedu/debian/kmplot-trinity.install b/ubuntu/maverick/tdeedu/debian/kmplot-trinity.install
index 4d7a52e48..c75adb783 100644
--- a/ubuntu/maverick/tdeedu/debian/kmplot-trinity.install
+++ b/ubuntu/maverick/tdeedu/debian/kmplot-trinity.install
@@ -4,10 +4,10 @@ opt/trinity/lib/trinity/libkmplotpart.so
 /opt/trinity/share/applications/kde/kmplot.desktop
 /opt/trinity/share/apps/kmplot
 /opt/trinity/share/config.kcfg/kmplot.kcfg
-/opt/trinity/share/doc/kde/HTML/en/kmplot/common
-/opt/trinity/share/doc/kde/HTML/en/kmplot/index.cache.bz2
-/opt/trinity/share/doc/kde/HTML/en/kmplot/*.docbook
-/opt/trinity/share/doc/kde/HTML/en/kmplot/*.png
+/opt/trinity/share/doc/tde/HTML/en/kmplot/common
+/opt/trinity/share/doc/tde/HTML/en/kmplot/index.cache.bz2
+/opt/trinity/share/doc/tde/HTML/en/kmplot/*.docbook
+/opt/trinity/share/doc/tde/HTML/en/kmplot/*.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kmplot.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kmplot.png
 /opt/trinity/share/icons/hicolor/32x32/apps/kmplot.png
diff --git a/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.install b/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.install
index 58166d933..592f5475b 100644
--- a/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.install
+++ b/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.install
@@ -1,10 +1,10 @@
 opt/trinity/bin/kpercentage
 /opt/trinity/share/applications/kde/kpercentage.desktop
 /opt/trinity/share/apps/kpercentage
-/opt/trinity/share/doc/kde/HTML/en/kpercentage/common
-/opt/trinity/share/doc/kde/HTML/en/kpercentage/index.cache.bz2
-/opt/trinity/share/doc/kde/HTML/en/kpercentage/*.docbook
-/opt/trinity/share/doc/kde/HTML/en/kpercentage/*.png
+/opt/trinity/share/doc/tde/HTML/en/kpercentage/common
+/opt/trinity/share/doc/tde/HTML/en/kpercentage/index.cache.bz2
+/opt/trinity/share/doc/tde/HTML/en/kpercentage/*.docbook
+/opt/trinity/share/doc/tde/HTML/en/kpercentage/*.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kpercentage.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kpercentage.png
 /opt/trinity/share/icons/hicolor/32x32/apps/kpercentage.png
diff --git a/ubuntu/maverick/tdeedu/debian/kstars-trinity.install b/ubuntu/maverick/tdeedu/debian/kstars-trinity.install
index 61544b793..78ed81fdf 100644
--- a/ubuntu/maverick/tdeedu/debian/kstars-trinity.install
+++ b/ubuntu/maverick/tdeedu/debian/kstars-trinity.install
@@ -4,10 +4,10 @@ opt/trinity/bin/kstars
 /opt/trinity/include/tde/simclockinterface.h
 /opt/trinity/share/applications/kde/kstars.desktop
 /opt/trinity/share/config.kcfg/kstars.kcfg
-/opt/trinity/share/doc/kde/HTML/en/kstars/common
-/opt/trinity/share/doc/kde/HTML/en/kstars/index.cache.bz2
-/opt/trinity/share/doc/kde/HTML/en/kstars/*.docbook
-/opt/trinity/share/doc/kde/HTML/en/kstars/*.png
+/opt/trinity/share/doc/tde/HTML/en/kstars/common
+/opt/trinity/share/doc/tde/HTML/en/kstars/index.cache.bz2
+/opt/trinity/share/doc/tde/HTML/en/kstars/*.docbook
+/opt/trinity/share/doc/tde/HTML/en/kstars/*.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kstars.png
 /opt/trinity/share/icons/hicolor/32x32/apps/kstars.png
 /opt/trinity/share/icons/hicolor/48x48/apps/kstars.png
diff --git a/ubuntu/maverick/tdeedu/debian/ktouch-trinity.install b/ubuntu/maverick/tdeedu/debian/ktouch-trinity.install
index 5debff448..da2308667 100644
--- a/ubuntu/maverick/tdeedu/debian/ktouch-trinity.install
+++ b/ubuntu/maverick/tdeedu/debian/ktouch-trinity.install
@@ -2,10 +2,10 @@ opt/trinity/bin/ktouch
 /opt/trinity/share/applications/kde/ktouch.desktop
 /opt/trinity/share/apps/ktouch
 /opt/trinity/share/config.kcfg/ktouch.kcfg
-/opt/trinity/share/doc/kde/HTML/en/ktouch/common
-/opt/trinity/share/doc/kde/HTML/en/ktouch/index.cache.bz2
-/opt/trinity/share/doc/kde/HTML/en/ktouch/*.docbook
-/opt/trinity/share/doc/kde/HTML/en/ktouch/*.png
+/opt/trinity/share/doc/tde/HTML/en/ktouch/common
+/opt/trinity/share/doc/tde/HTML/en/ktouch/index.cache.bz2
+/opt/trinity/share/doc/tde/HTML/en/ktouch/*.docbook
+/opt/trinity/share/doc/tde/HTML/en/ktouch/*.png
 /opt/trinity/share/icons/hicolor/16x16/apps/ktouch.png
 /opt/trinity/share/icons/hicolor/22x22/apps/ktouch.png
 /opt/trinity/share/icons/hicolor/32x32/apps/ktouch.png
diff --git a/ubuntu/maverick/tdeedu/debian/kturtle-trinity.install b/ubuntu/maverick/tdeedu/debian/kturtle-trinity.install
index 951114df2..f5f42ad75 100644
--- a/ubuntu/maverick/tdeedu/debian/kturtle-trinity.install
+++ b/ubuntu/maverick/tdeedu/debian/kturtle-trinity.install
@@ -3,10 +3,10 @@ opt/trinity/bin/kturtle
 /opt/trinity/share/apps/katepart/syntax/logohighlightstyle*
 /opt/trinity/share/apps/kturtle
 /opt/trinity/share/config.kcfg/kturtle.kcfg
-/opt/trinity/share/doc/kde/HTML/en/kturtle/*.bz2
-/opt/trinity/share/doc/kde/HTML/en/kturtle/common
-/opt/trinity/share/doc/kde/HTML/en/kturtle/*.docbook
-/opt/trinity/share/doc/kde/HTML/en/kturtle/*.png
+/opt/trinity/share/doc/tde/HTML/en/kturtle/*.bz2
+/opt/trinity/share/doc/tde/HTML/en/kturtle/common
+/opt/trinity/share/doc/tde/HTML/en/kturtle/*.docbook
+/opt/trinity/share/doc/tde/HTML/en/kturtle/*.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kturtle.png
 /opt/trinity/share/icons/hicolor/32x32/apps/kturtle.png
 ../icons/kturtle.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdeedu/debian/kverbos-trinity.install b/ubuntu/maverick/tdeedu/debian/kverbos-trinity.install
index 63261246d..7ce86854f 100644
--- a/ubuntu/maverick/tdeedu/debian/kverbos-trinity.install
+++ b/ubuntu/maverick/tdeedu/debian/kverbos-trinity.install
@@ -2,10 +2,10 @@ opt/trinity/bin/kverbos
 /opt/trinity/share/applications/kde/kverbos.desktop
 /opt/trinity/share/apps/kverbos
 /opt/trinity/share/config.kcfg/kverbos.kcfg
-/opt/trinity/share/doc/kde/HTML/en/kverbos/common
-/opt/trinity/share/doc/kde/HTML/en/kverbos/index.cache.bz2
-/opt/trinity/share/doc/kde/HTML/en/kverbos/*.docbook
-/opt/trinity/share/doc/kde/HTML/en/kverbos/*.png
+/opt/trinity/share/doc/tde/HTML/en/kverbos/common
+/opt/trinity/share/doc/tde/HTML/en/kverbos/index.cache.bz2
+/opt/trinity/share/doc/tde/HTML/en/kverbos/*.docbook
+/opt/trinity/share/doc/tde/HTML/en/kverbos/*.png
 /opt/trinity/share/icons/crystalsvg/16x16/actions/kverbosuser.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kverbos.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kverbos.png
diff --git a/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.install b/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.install
index d11421692..07d71a27f 100644
--- a/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.install
+++ b/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.install
@@ -11,10 +11,10 @@ opt/trinity/lib/libkvoctraincore.so.0.0.0
 /opt/trinity/share/config.kcfg/kvoctrain.kcfg
 /opt/trinity/share/config.kcfg/languagesettings.kcfg
 /opt/trinity/share/config.kcfg/presettings.kcfg
-/opt/trinity/share/doc/kde/HTML/en/kvoctrain/common
-/opt/trinity/share/doc/kde/HTML/en/kvoctrain/index.cache.bz2
-/opt/trinity/share/doc/kde/HTML/en/kvoctrain/*.docbook
-/opt/trinity/share/doc/kde/HTML/en/kvoctrain/*.png
+/opt/trinity/share/doc/tde/HTML/en/kvoctrain/common
+/opt/trinity/share/doc/tde/HTML/en/kvoctrain/index.cache.bz2
+/opt/trinity/share/doc/tde/HTML/en/kvoctrain/*.docbook
+/opt/trinity/share/doc/tde/HTML/en/kvoctrain/*.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kvoctrain.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kvoctrain.png
 /opt/trinity/share/icons/hicolor/32x32/apps/kvoctrain.png
diff --git a/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.install b/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.install
index fb0ef9bf4..6490edf60 100644
--- a/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.install
+++ b/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.install
@@ -3,10 +3,10 @@ opt/trinity/bin/kwordquiz
 /opt/trinity/share/applications/kde/kwordquiz.desktop
 /opt/trinity/share/apps/kwordquiz
 /opt/trinity/share/config.kcfg/kwordquiz.kcfg
-/opt/trinity/share/doc/kde/HTML/en/kwordquiz/*.bz2
-/opt/trinity/share/doc/kde/HTML/en/kwordquiz/common
-/opt/trinity/share/doc/kde/HTML/en/kwordquiz/*.docbook
-/opt/trinity/share/doc/kde/HTML/en/kwordquiz/*.png
+/opt/trinity/share/doc/tde/HTML/en/kwordquiz/*.bz2
+/opt/trinity/share/doc/tde/HTML/en/kwordquiz/common
+/opt/trinity/share/doc/tde/HTML/en/kwordquiz/*.docbook
+/opt/trinity/share/doc/tde/HTML/en/kwordquiz/*.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kwordquiz.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kwordquiz.png
 /opt/trinity/share/icons/hicolor/32x32/apps/kwordquiz.png
diff --git a/ubuntu/maverick/tdeedu/debian/man/blinken-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/blinken-trinity.1
index fb910889e..e52c7c668 100644
--- a/ubuntu/maverick/tdeedu/debian/man/blinken-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/blinken-trinity.1
@@ -43,7 +43,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/blinken/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/blinken/\fP.
 .SH AUTHOR
 Blinken was written by Albert Astals Cid <tsdgeos@terra.es> and
 Danny Allen <danny@dannyallen.co.uk>.
diff --git a/ubuntu/maverick/tdeedu/debian/man/celestrongps-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/celestrongps-trinity.1
index 97c930e5b..bce30b4c4 100644
--- a/ubuntu/maverick/tdeedu/debian/man/celestrongps-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/celestrongps-trinity.1
@@ -56,7 +56,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
 Heiko Evermann <heiko@evermann.de>, Thomas Kabelmann <tk78@gmx.de>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/fliccd-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/fliccd-trinity.1
index bddac3b61..a909cde14 100644
--- a/ubuntu/maverick/tdeedu/debian/man/fliccd-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/fliccd-trinity.1
@@ -56,7 +56,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
 Heiko Evermann <heiko@evermann.de>, Thomas Kabelmann <tk78@gmx.de>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/indiserver-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/indiserver-trinity.1
index 35ecd6952..1504c0631 100644
--- a/ubuntu/maverick/tdeedu/debian/man/indiserver-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/indiserver-trinity.1
@@ -110,7 +110,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
 Heiko Evermann <heiko@evermann.de>, Thomas Kabelmann <tk78@gmx.de>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/kalzium-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kalzium-trinity.1
index 2f1fa5a44..9792c173d 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kalzium-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kalzium-trinity.1
@@ -47,7 +47,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kalzium/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kalzium/\fP.
 .SH AUTHOR
 Kalzium was written by Carsten Niehaus <cniehaus@kde.org>.
 .br
diff --git a/ubuntu/maverick/tdeedu/debian/man/kanagram-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kanagram-trinity.1
index 3990c7e98..35a1c1f78 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kanagram-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kanagram-trinity.1
@@ -44,7 +44,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kanagram/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kanagram/\fP.
 .SH AUTHOR
 KAnagram was written by Joshua Keel <joshuakeel@gmail.com> and
 Danny Allen <danny@dannyallen.co.uk>.
diff --git a/ubuntu/maverick/tdeedu/debian/man/kbruch-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kbruch-trinity.1
index c57370906..51b7ab0b8 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kbruch-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kbruch-trinity.1
@@ -38,7 +38,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kbruch/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kbruch/\fP.
 .SH AUTHOR
 KBruch was written by Sebastian Stein <seb.kde@hpfsc.de>,
 Eva Brucherseifer <eva@kde.org> and others.
diff --git a/ubuntu/maverick/tdeedu/debian/man/keduca-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/keduca-trinity.1
index 4f265e43b..6b2f607eb 100644
--- a/ubuntu/maverick/tdeedu/debian/man/keduca-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/keduca-trinity.1
@@ -43,7 +43,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/keduca/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/keduca/\fP.
 .SH AUTHOR
 KEduca was written by Javier Campos <javi@asyris.org>,
 Klas Kalass <klas@kde.org>, Henrique Pinto <henrique.pinto@kdemail.net>
diff --git a/ubuntu/maverick/tdeedu/debian/man/keducabuilder-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/keducabuilder-trinity.1
index 8ebe53045..1028a8927 100644
--- a/ubuntu/maverick/tdeedu/debian/man/keducabuilder-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/keducabuilder-trinity.1
@@ -43,7 +43,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/keduca/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/keduca/\fP.
 .SH AUTHOR
 KEduca was written by Javier Campos <javi@asyris.org>,
 Klas Kalass <klas@kde.org>, Henrique Pinto <henrique.pinto@kdemail.net>
diff --git a/ubuntu/maverick/tdeedu/debian/man/kgeography-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kgeography-trinity.1
index 4f340d39f..b25bb7076 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kgeography-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kgeography-trinity.1
@@ -39,7 +39,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kgeography/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kgeography/\fP.
 .SH AUTHOR
 KGeography was written by Albert Astals Cid <tsdgeos@terra.es>.
 .br
diff --git a/ubuntu/maverick/tdeedu/debian/man/khangman-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/khangman-trinity.1
index be0f29cbf..a5fc8f698 100644
--- a/ubuntu/maverick/tdeedu/debian/man/khangman-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/khangman-trinity.1
@@ -43,7 +43,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/khangman/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/khangman/\fP.
 .SH AUTHOR
 KHangMan was written by Primoz Anzur <zerokode@gmx.net> and
 Anne-Marie Mahfouf <annma@kde.org>.
diff --git a/ubuntu/maverick/tdeedu/debian/man/kig-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kig-trinity.1
index 1c9089adb..0238e3569 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kig-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kig-trinity.1
@@ -70,7 +70,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kig/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kig/\fP.
 .SH AUTHOR
 Kig was written by Dominique Devriese <devriese@kde.org>,
 Maurizio Paolini <paolini@dmf.bs.unicatt.it>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/kiten-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kiten-trinity.1
index 51942642e..77a7269f0 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kiten-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kiten-trinity.1
@@ -42,7 +42,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kiten/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kiten/\fP.
 .SH AUTHOR
 Kiten was written by Jason Katz-Brown <jason@katzbrown.com>,
 Jim Breen <jwb@csse.monash.edu.au> and
diff --git a/ubuntu/maverick/tdeedu/debian/man/kitengen-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kitengen-trinity.1
index b3926aec9..ee8e8c4c2 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kitengen-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kitengen-trinity.1
@@ -45,7 +45,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kiten/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kiten/\fP.
 .SH AUTHOR
 Kiten was written by Jason Katz-Brown <jason@katzbrown.com>,
 Jim Breen <jwb@csse.monash.edu.au> and
diff --git a/ubuntu/maverick/tdeedu/debian/man/klatin-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/klatin-trinity.1
index 7ce6d33a0..dd1b100cf 100644
--- a/ubuntu/maverick/tdeedu/debian/man/klatin-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/klatin-trinity.1
@@ -48,7 +48,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/klatin/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/klatin/\fP.
 .SH AUTHOR
 KLatin was written by George Wright <gwright@kde.org> and others.
 .br
diff --git a/ubuntu/maverick/tdeedu/debian/man/klettres-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/klettres-trinity.1
index a241fa4f0..01b3826b8 100644
--- a/ubuntu/maverick/tdeedu/debian/man/klettres-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/klettres-trinity.1
@@ -42,7 +42,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/klettres/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/klettres/\fP.
 .SH AUTHOR
 KLettres was written by Anne-Marie Mahfouf <annma@kde.org> and many others.
 .br
diff --git a/ubuntu/maverick/tdeedu/debian/man/kmplot-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kmplot-trinity.1
index 257190530..8f5f1d431 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kmplot-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kmplot-trinity.1
@@ -49,7 +49,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kmplot/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kmplot/\fP.
 .SH AUTHOR
 KmPlot was written by Klaus-Dieter Moeller <tdmoeller@foni.net>,
 Matthias Messmer <bmlmessmer@web.de> and Fredrik Edemar <f_edemar@linux.se>.
diff --git a/ubuntu/maverick/tdeedu/debian/man/kpercentage-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kpercentage-trinity.1
index 00eead897..6cdb905b5 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kpercentage-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kpercentage-trinity.1
@@ -41,7 +41,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kpercentage/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kpercentage/\fP.
 .SH AUTHOR
 KPercentage was written by Matthias Messmer <bmlmessmer@web.de>,
 Carsten Niehaus <cniehaus@gmx.de> and Robert Gogolok <mail@robert-gogolok.de>.
diff --git a/ubuntu/maverick/tdeedu/debian/man/kstars-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kstars-trinity.1
index 28e2769a6..fed1ca9b9 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kstars-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kstars-trinity.1
@@ -104,7 +104,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kstars/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kstars/\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
 Heiko Evermann <heiko@evermann.de>, Thomas Kabelmann <tk78@gmx.de>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/ktouch-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/ktouch-trinity.1
index f16100d86..dba00f4fb 100644
--- a/ubuntu/maverick/tdeedu/debian/man/ktouch-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/ktouch-trinity.1
@@ -47,7 +47,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/ktouch/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/ktouch/\fP.
 .SH AUTHOR
 KTouch was written by Haavard Froeiland <haavard@users.sourceforge.net>
 and Andreas Nicolai <Andreas.Nicolai@gmx.net>.
diff --git a/ubuntu/maverick/tdeedu/debian/man/kturtle-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kturtle-trinity.1
index 87142fc2d..5c048f946 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kturtle-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kturtle-trinity.1
@@ -51,7 +51,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kturtle/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kturtle/\fP.
 .SH AUTHOR
 KTurtle was written by Cies Breijs <cies # kde.nl>,
 Walter Schreppers <Walter.Schreppers # ua.ac.be> and
diff --git a/ubuntu/maverick/tdeedu/debian/man/kverbos-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kverbos-trinity.1
index 3dc070868..08f956415 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kverbos-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kverbos-trinity.1
@@ -46,7 +46,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kverbos/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kverbos/\fP.
 .SH AUTHOR
 Kverbos was written by Arnold Kraschinski <arnold.k67@gmx.de>.
 .br
diff --git a/ubuntu/maverick/tdeedu/debian/man/kvoctrain-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kvoctrain-trinity.1
index 9a738f419..52ca3fabb 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kvoctrain-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kvoctrain-trinity.1
@@ -51,7 +51,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kvoctrain/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kvoctrain/\fP.
 .SH AUTHOR
 KVocTrain was written by Ewald Arnold <kvoctrain@ewald-arnold.de>
 and Peter Hedlund <peter@peterandlinda.com>.
diff --git a/ubuntu/maverick/tdeedu/debian/man/kwordquiz-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kwordquiz-trinity.1
index dd2d9d1c6..387d9bbac 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kwordquiz-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/kwordquiz-trinity.1
@@ -61,7 +61,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kwordquiz/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kwordquiz/\fP.
 .SH AUTHOR
 KWordQuiz was written by Peter Hedlund <peter@peterandlinda.com>.
 .br
diff --git a/ubuntu/maverick/tdeedu/debian/man/lx200_16-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/lx200_16-trinity.1
index a15ba93f1..5ac503e7d 100644
--- a/ubuntu/maverick/tdeedu/debian/man/lx200_16-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/lx200_16-trinity.1
@@ -56,7 +56,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
 Heiko Evermann <heiko@evermann.de>, Thomas Kabelmann <tk78@gmx.de>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/lx200autostar-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/lx200autostar-trinity.1
index 2067b14a5..4f9d11c95 100644
--- a/ubuntu/maverick/tdeedu/debian/man/lx200autostar-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/lx200autostar-trinity.1
@@ -56,7 +56,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
 Heiko Evermann <heiko@evermann.de>, Thomas Kabelmann <tk78@gmx.de>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/lx200classic-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/lx200classic-trinity.1
index 1adef37dd..481d6e01a 100644
--- a/ubuntu/maverick/tdeedu/debian/man/lx200classic-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/lx200classic-trinity.1
@@ -56,7 +56,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
 Heiko Evermann <heiko@evermann.de>, Thomas Kabelmann <tk78@gmx.de>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/lx200generic-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/lx200generic-trinity.1
index d1a78b97e..d1d52f121 100644
--- a/ubuntu/maverick/tdeedu/debian/man/lx200generic-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/lx200generic-trinity.1
@@ -56,7 +56,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
 Heiko Evermann <heiko@evermann.de>, Thomas Kabelmann <tk78@gmx.de>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/lx200gps-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/lx200gps-trinity.1
index edd53b5de..ec533e6d8 100644
--- a/ubuntu/maverick/tdeedu/debian/man/lx200gps-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/lx200gps-trinity.1
@@ -56,7 +56,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
 Heiko Evermann <heiko@evermann.de>, Thomas Kabelmann <tk78@gmx.de>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/temma-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/temma-trinity.1
index 6bdcc633a..1e3db31c9 100644
--- a/ubuntu/maverick/tdeedu/debian/man/temma-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/temma-trinity.1
@@ -56,7 +56,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
 Heiko Evermann <heiko@evermann.de>, Thomas Kabelmann <tk78@gmx.de>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/v4ldriver-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/v4ldriver-trinity.1
index b53755563..f9f4c52d0 100644
--- a/ubuntu/maverick/tdeedu/debian/man/v4ldriver-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/v4ldriver-trinity.1
@@ -56,7 +56,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
 Heiko Evermann <heiko@evermann.de>, Thomas Kabelmann <tk78@gmx.de>,
diff --git a/ubuntu/maverick/tdeedu/debian/man/v4lphilips-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/v4lphilips-trinity.1
index b56ca96cf..40838ded0 100644
--- a/ubuntu/maverick/tdeedu/debian/man/v4lphilips-trinity.1
+++ b/ubuntu/maverick/tdeedu/debian/man/v4lphilips-trinity.1
@@ -56,7 +56,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kstars/indi.html\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
 .SH AUTHOR
 KStars was written by Jason Harris <jharris@30doradus.org>,
 Heiko Evermann <heiko@evermann.de>, Thomas Kabelmann <tk78@gmx.de>,
diff --git a/ubuntu/maverick/tdeedu/debian/rules b/ubuntu/maverick/tdeedu/debian/rules
index 059005f50..2c6198c42 100755
--- a/ubuntu/maverick/tdeedu/debian/rules
+++ b/ubuntu/maverick/tdeedu/debian/rules
@@ -30,8 +30,8 @@ common-install-prehook-arch::
 build/kig-trinity::
 	cp $(DEB_SRCDIR)/doc/kig/scripting-api/*.png $(DEB_BUILDDIR)/doc/kig/scripting-api/
 	cd $(DEB_BUILDDIR)/doc/kig/scripting-api && doxygen Doxyfile.scripting-api
-	install -d -m 755 $(DEB_BUILDDIR)/doc/kig/scripting-api/build/html/ debian/tmp/opt/trinity/share/doc/kde/HTML/en/kig/scripting-api/
-	install -m644  $(DEB_BUILDDIR)/doc/kig/scripting-api/build/html/* debian/tmp/opt/trinity/share/doc/kde/HTML/en/kig/scripting-api/
+	install -d -m 755 $(DEB_BUILDDIR)/doc/kig/scripting-api/build/html/ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kig/scripting-api/
+	install -m644  $(DEB_BUILDDIR)/doc/kig/scripting-api/build/html/* debian/tmp/opt/trinity/share/doc/tde/HTML/en/kig/scripting-api/
 
 
 
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.blinken b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.blinken
index 4391fbe96..0981d3897 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.blinken
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.blinken
@@ -6,5 +6,5 @@ Abstract: Blinken brings a retro electronic memory game from the 1970's
 Section: Games/Puzzles
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/blinken/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/blinken/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/blinken/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/blinken/*.html
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kalzium b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kalzium
index c7a3e23a3..41475e0ee 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kalzium
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kalzium
@@ -7,5 +7,5 @@ Abstract: Kalzium is a program which shows you the Periodic System of
 Section: Apps/Science
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kalzium/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kalzium/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kalzium/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kalzium/*.html
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kbruch b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kbruch
index 3a2ca7ed2..117156815 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kbruch
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kbruch
@@ -7,5 +7,5 @@ Abstract: KBruch is a small program to practice calculating with fractions.
 Section: Apps/Math
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kbruch/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kbruch/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kbruch/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kbruch/*.html
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.keduca b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.keduca
index f8ef86fbb..810f29b8c 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.keduca
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.keduca
@@ -6,5 +6,5 @@ Abstract: KEduca is flash card application which allows you to make
 Section: Apps/Tools
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/keduca/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/keduca/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/keduca/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/keduca/*.html
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kgeography b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kgeography
index 5f263705b..0f3d386af 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kgeography
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kgeography
@@ -5,5 +5,5 @@ Abstract: KGeography is a geography learning tool for KDE.
 Section: Apps/Education
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kgeography/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kgeography/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kgeography/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kgeography/*.html
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.khangman b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.khangman
index f01c66ba2..c6b25da48 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.khangman
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.khangman
@@ -5,5 +5,5 @@ Abstract: KHangMan is the classical hangman game for children, adapted for KDE.
 Section: Games/Puzzles
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/khangman/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/khangman/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/khangman/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/khangman/*.html
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kig b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kig
index f7f63bac4..e8569fb22 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kig
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kig
@@ -5,5 +5,5 @@ Abstract: Kig is a KDE application for Interactive Geometry.
 Section: Apps/Math
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kig/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kig/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kig/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kig/*.html
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kiten b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kiten
index 9339500ee..a8b4130a6 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kiten
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kiten
@@ -5,5 +5,5 @@ Abstract: Kiten is a Japanese reference/study tool for KDE.
 Section: Apps/Tools
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kiten/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kiten/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kiten/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kiten/*.html
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.klatin b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.klatin
index ba3750a70..a5f795b93 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.klatin
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.klatin
@@ -5,5 +5,5 @@ Abstract: KLatin is a KDE application to help revise/teach Latin.
 Section: Apps/Tools
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/klatin/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/klatin/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/klatin/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/klatin/*.html
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.klettres b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.klettres
index 504bd1cca..9c3595aad 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.klettres
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.klettres
@@ -8,5 +8,5 @@ Abstract: KLettres is an application specially designed to help the user
 Section: Apps/Tools
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/klettres/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/klettres/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/klettres/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/klettres/*.html
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kmplot b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kmplot
index 8e8350ba8..6a2342dab 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kmplot
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kmplot
@@ -5,5 +5,5 @@ Abstract: KmPlot is a mathematical function plotter for the KDE Desktop.
 Section: Apps/Math
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kmplot/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kmplot/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kmplot/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kmplot/*.html
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kpercentage b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kpercentage
index 1f8972434..2c172778c 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kpercentage
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kpercentage
@@ -6,5 +6,5 @@ Abstract: KPercentage is a small math application that will help pupils
 Section: Apps/Math
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kpercentage/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kpercentage/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpercentage/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpercentage/*.html
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kstars b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kstars
index 2c0544de6..33b5ec707 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kstars
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kstars
@@ -8,5 +8,5 @@ Abstract: KStars is a graphical desktop planetarium for KDE.  It depicts an
 Section: Apps/Science
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kstars/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kstars/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kstars/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kstars/*.html
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.ktouch b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.ktouch
index 9908362ca..a7815e054 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.ktouch
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.ktouch
@@ -8,5 +8,5 @@ Abstract: KTouch is a program for learning to touch type.  KTouch
 Section: Apps/Tools
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/ktouch/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/ktouch/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/ktouch/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/ktouch/*.html
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kturtle b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kturtle
index cde120379..3104fe43e 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kturtle
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kturtle
@@ -8,5 +8,5 @@ Abstract: KTurtle is an educational programming environment using the
 Section: Apps/Programming
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kturtle/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kturtle/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kturtle/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kturtle/*.html
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kverbos b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kverbos
index 49faf645e..6a1dd3d86 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kverbos
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kverbos
@@ -6,5 +6,5 @@ Abstract: Kverbos is an application specially designed to study Spanish
 Section: Apps/Tools
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kverbos/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kverbos/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kverbos/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kverbos/*.html
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kvoctrain b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kvoctrain
index af4dca29e..a789694b6 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kvoctrain
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kvoctrain
@@ -6,5 +6,5 @@ Abstract: KVocTrain is a little utility to help you train your vocabulary,
 Section: Apps/Tools
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kvoctrain/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kvoctrain/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kvoctrain/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kvoctrain/*.html
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kwordquiz b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kwordquiz
index 290adbc1f..1635db7e2 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kwordquiz
+++ b/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kwordquiz
@@ -5,5 +5,5 @@ Abstract: KWordQuiz is a flashcard and vocabulary learning program for KDE.
 Section: Apps/Tools
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kwordquiz/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kwordquiz/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kwordquiz/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kwordquiz/*.html
diff --git a/ubuntu/maverick/tdegames/debian/atlantik-trinity.install b/ubuntu/maverick/tdegames/debian/atlantik-trinity.install
index d4a54c6c7..d1c3e9730 100644
--- a/ubuntu/maverick/tdegames/debian/atlantik-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/atlantik-trinity.install
@@ -8,7 +8,7 @@
 /opt/trinity/lib/trinity/kio_atlantik.la
 /opt/trinity/lib/trinity/kio_atlantik.so
 /opt/trinity/share/services/atlantik.protocol
-/opt/trinity/share/doc/kde/HTML/en/atlantik/*
+/opt/trinity/share/doc/tde/HTML/en/atlantik/*
 /opt/trinity/share/applications/kde/atlantik.desktop
 /opt/trinity/share/icons/hicolor/48x48/apps/atlantik.png
 /opt/trinity/share/icons/hicolor/32x32/apps/atlantik.png
diff --git a/ubuntu/maverick/tdegames/debian/atlantik-trinity.links b/ubuntu/maverick/tdegames/debian/atlantik-trinity.links
index 14ae4888f..b368efade 100644
--- a/ubuntu/maverick/tdegames/debian/atlantik-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/atlantik-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/atlantik /opt/trinity/share/doc/atlantik/html
+/opt/trinity/share/doc/tde/HTML/en/atlantik /opt/trinity/share/doc/atlantik/html
diff --git a/ubuntu/maverick/tdegames/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdegames/debian/cdbs/debian-qt-kde.mk
index cae625265..d135c4257 100644
--- a/ubuntu/maverick/tdegames/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdegames/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/tdegames/debian/cdbs/kde.mk b/ubuntu/maverick/tdegames/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/tdegames/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdegames/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/tdegames/debian/control b/ubuntu/maverick/tdegames/debian/control
index 9f634b9b7..00c6c810b 100644
--- a/ubuntu/maverick/tdegames/debian/control
+++ b/ubuntu/maverick/tdegames/debian/control
@@ -38,8 +38,8 @@ Description: KDE games documentation in HTML format
  read with any web browser.
  .
  The documentation will be installed into the usual directories
- /usr/share/doc/kde/HTML/en/<package>/, for instance
- /usr/share/doc/kde/HTML/en/kasteroids/.
+ /usr/share/doc/tde/HTML/en/<package>/, for instance
+ /usr/share/doc/tde/HTML/en/kasteroids/.
  .
  This package is part of KDE, and a component of the KDE games module.
  See the 'kde-trinity' and 'tdegames-trinity' packages for more information.
diff --git a/ubuntu/maverick/tdegames/debian/control.in b/ubuntu/maverick/tdegames/debian/control.in
index 38f0737b9..67794be8c 100644
--- a/ubuntu/maverick/tdegames/debian/control.in
+++ b/ubuntu/maverick/tdegames/debian/control.in
@@ -34,8 +34,8 @@ Description: KDE games documentation in HTML format
  read with any web browser.
  .
  The documentation will be installed into the usual directories
- /usr/share/doc/kde/HTML/en/<package>/, for instance
- /usr/share/doc/kde/HTML/en/kasteroids/.
+ /usr/share/doc/tde/HTML/en/<package>/, for instance
+ /usr/share/doc/tde/HTML/en/kasteroids/.
  .
  This package is part of KDE, and a component of the KDE games module.
  See the 'kde' and 'tdegames' packages for more information.
diff --git a/ubuntu/maverick/tdegames/debian/kasteroids-trinity.install b/ubuntu/maverick/tdegames/debian/kasteroids-trinity.install
index 7c799a91c..ae24b2a78 100644
--- a/ubuntu/maverick/tdegames/debian/kasteroids-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/kasteroids-trinity.install
@@ -8,6 +8,6 @@
 /opt/trinity/share/applications/kde/kasteroids.desktop
 /opt/trinity/share/apps/kasteroids/*
 /opt/trinity/share/config.kcfg/kasteroids.kcfg
-/opt/trinity/share/doc/kde/HTML/en/kasteroids/*
+/opt/trinity/share/doc/tde/HTML/en/kasteroids/*
 ../icons/kasteroids.xpm /opt/trinity/share/pixmaps
 ../icons/kasteroids-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegames/debian/kasteroids-trinity.links b/ubuntu/maverick/tdegames/debian/kasteroids-trinity.links
index 7b39440be..5e93c0fe3 100644
--- a/ubuntu/maverick/tdegames/debian/kasteroids-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/kasteroids-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kasteroids /opt/trinity/share/doc/kasteroids/html
+/opt/trinity/share/doc/tde/HTML/en/kasteroids /opt/trinity/share/doc/kasteroids/html
diff --git a/ubuntu/maverick/tdegames/debian/katomic-trinity.install b/ubuntu/maverick/tdegames/debian/katomic-trinity.install
index 29a840c69..fca842275 100644
--- a/ubuntu/maverick/tdegames/debian/katomic-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/katomic-trinity.install
@@ -7,6 +7,6 @@
 /opt/trinity/share/icons/hicolor/128x128/apps/katomic.png
 /opt/trinity/share/applications/kde/katomic.desktop
 /opt/trinity/games/katomic
-/opt/trinity/share/doc/kde/HTML/en/katomic/*
+/opt/trinity/share/doc/tde/HTML/en/katomic/*
 ../icons/katomic.xpm /opt/trinity/share/pixmaps
 ../icons/katomic-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegames/debian/katomic-trinity.links b/ubuntu/maverick/tdegames/debian/katomic-trinity.links
index ba10e1ab2..e254acaa5 100644
--- a/ubuntu/maverick/tdegames/debian/katomic-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/katomic-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/katomic /opt/trinity/share/doc/katomic/html
+/opt/trinity/share/doc/tde/HTML/en/katomic /opt/trinity/share/doc/katomic/html
diff --git a/ubuntu/maverick/tdegames/debian/kbackgammon-trinity.install b/ubuntu/maverick/tdegames/debian/kbackgammon-trinity.install
index 941475658..41b81b789 100644
--- a/ubuntu/maverick/tdegames/debian/kbackgammon-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/kbackgammon-trinity.install
@@ -11,6 +11,6 @@
 /opt/trinity/share/icons/hicolor/48x48/apps/kbackgammon_engine.png
 /opt/trinity/share/icons/hicolor/32x32/apps/kbackgammon_engine.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kbackgammon_engine.png
-/opt/trinity/share/doc/kde/HTML/en/kbackgammon/*
+/opt/trinity/share/doc/tde/HTML/en/kbackgammon/*
 ../icons/kbackgammon.xpm /opt/trinity/share/pixmaps
 ../icons/kbackgammon-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegames/debian/kbackgammon-trinity.links b/ubuntu/maverick/tdegames/debian/kbackgammon-trinity.links
index 119c3f0a8..0aeb5b85c 100644
--- a/ubuntu/maverick/tdegames/debian/kbackgammon-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/kbackgammon-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kbackgammon /opt/trinity/share/doc/kbackgammon/html
+/opt/trinity/share/doc/tde/HTML/en/kbackgammon /opt/trinity/share/doc/kbackgammon/html
diff --git a/ubuntu/maverick/tdegames/debian/kbattleship-trinity.install b/ubuntu/maverick/tdegames/debian/kbattleship-trinity.install
index 9bc01522a..68a6e39ca 100644
--- a/ubuntu/maverick/tdegames/debian/kbattleship-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/kbattleship-trinity.install
@@ -8,6 +8,6 @@
 /opt/trinity/share/icons/hicolor/16x16/apps/kbattleship.png
 /opt/trinity/share/applications/kde/kbattleship.desktop
 /opt/trinity/games/kbattleship
-/opt/trinity/share/doc/kde/HTML/en/kbattleship/*
+/opt/trinity/share/doc/tde/HTML/en/kbattleship/*
 ../icons/kbattleship.xpm /opt/trinity/share/pixmaps
 ../icons/kbattleship-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegames/debian/kbattleship-trinity.links b/ubuntu/maverick/tdegames/debian/kbattleship-trinity.links
index 78c40b9b4..5db9ac11d 100644
--- a/ubuntu/maverick/tdegames/debian/kbattleship-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/kbattleship-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kbattleship /opt/trinity/share/doc/kbattleship/html
+/opt/trinity/share/doc/tde/HTML/en/kbattleship /opt/trinity/share/doc/kbattleship/html
diff --git a/ubuntu/maverick/tdegames/debian/kblackbox-trinity.install b/ubuntu/maverick/tdegames/debian/kblackbox-trinity.install
index 36d853284..d801df8cc 100644
--- a/ubuntu/maverick/tdegames/debian/kblackbox-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/kblackbox-trinity.install
@@ -7,6 +7,6 @@
 /opt/trinity/share/icons/hicolor/16x16/apps/kblackbox.png
 /opt/trinity/share/applications/kde/kblackbox.desktop
 /opt/trinity/games/kblackbox
-/opt/trinity/share/doc/kde/HTML/en/kblackbox/*
+/opt/trinity/share/doc/tde/HTML/en/kblackbox/*
 ../icons/kblackbox.xpm /opt/trinity/share/pixmaps
 ../icons/kblackbox-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegames/debian/kblackbox-trinity.links b/ubuntu/maverick/tdegames/debian/kblackbox-trinity.links
index c3ea601b2..13ff89735 100644
--- a/ubuntu/maverick/tdegames/debian/kblackbox-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/kblackbox-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kblackbox /opt/trinity/share/doc/kblackbox/html
+/opt/trinity/share/doc/tde/HTML/en/kblackbox /opt/trinity/share/doc/kblackbox/html
diff --git a/ubuntu/maverick/tdegames/debian/kbounce-trinity.install b/ubuntu/maverick/tdegames/debian/kbounce-trinity.install
index de4afbe7a..7c9bac7b3 100644
--- a/ubuntu/maverick/tdegames/debian/kbounce-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/kbounce-trinity.install
@@ -7,6 +7,6 @@
 /opt/trinity/share/icons/hicolor/64x64/apps/kbounce.png
 /opt/trinity/share/icons/hicolor/128x128/apps/kbounce.png
 /opt/trinity/games/kbounce
-/opt/trinity/share/doc/kde/HTML/en/kbounce/*
+/opt/trinity/share/doc/tde/HTML/en/kbounce/*
 ../icons/kbounce.xpm /opt/trinity/share/pixmaps
 ../icons/kbounce-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegames/debian/kbounce-trinity.links b/ubuntu/maverick/tdegames/debian/kbounce-trinity.links
index 2d37a75f7..5e91fe04e 100644
--- a/ubuntu/maverick/tdegames/debian/kbounce-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/kbounce-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kbounce /opt/trinity/share/doc/kbounce/html
+/opt/trinity/share/doc/tde/HTML/en/kbounce /opt/trinity/share/doc/kbounce/html
diff --git a/ubuntu/maverick/tdegames/debian/kenolaba-trinity.install b/ubuntu/maverick/tdegames/debian/kenolaba-trinity.install
index e5f25d1f2..121e8ae52 100644
--- a/ubuntu/maverick/tdegames/debian/kenolaba-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/kenolaba-trinity.install
@@ -7,6 +7,6 @@
 /opt/trinity/share/icons/hicolor/128x128/apps/kenolaba.png
 /opt/trinity/share/applications/kde/kenolaba.desktop
 /opt/trinity/games/kenolaba
-/opt/trinity/share/doc/kde/HTML/en/kenolaba/*
+/opt/trinity/share/doc/tde/HTML/en/kenolaba/*
 ../icons/kenolaba.xpm /opt/trinity/share/pixmaps
 ../icons/kenolaba-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegames/debian/kenolaba-trinity.links b/ubuntu/maverick/tdegames/debian/kenolaba-trinity.links
index 7925c1237..03980edc3 100644
--- a/ubuntu/maverick/tdegames/debian/kenolaba-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/kenolaba-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kenolaba /opt/trinity/share/doc/kenolaba/html
+/opt/trinity/share/doc/tde/HTML/en/kenolaba /opt/trinity/share/doc/kenolaba/html
diff --git a/ubuntu/maverick/tdegames/debian/kfouleggs-trinity.install b/ubuntu/maverick/tdegames/debian/kfouleggs-trinity.install
index 39767928f..4ceaf21df 100644
--- a/ubuntu/maverick/tdegames/debian/kfouleggs-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/kfouleggs-trinity.install
@@ -2,7 +2,7 @@
 /opt/trinity/share/apps/kfouleggs/*
 /opt/trinity/share/config.kcfg/kfouleggs.kcfg
 /opt/trinity/games/kfouleggs
-/opt/trinity/share/doc/kde/HTML/en/kfouleggs/*
+/opt/trinity/share/doc/tde/HTML/en/kfouleggs/*
 /opt/trinity/share/icons/hicolor/16x16/apps/kfouleggs.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kfouleggs.png
 /opt/trinity/share/icons/hicolor/32x32/apps/kfouleggs.png
diff --git a/ubuntu/maverick/tdegames/debian/kfouleggs-trinity.links b/ubuntu/maverick/tdegames/debian/kfouleggs-trinity.links
index 3d3bb7728..5d1835277 100644
--- a/ubuntu/maverick/tdegames/debian/kfouleggs-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/kfouleggs-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kfouleggs /opt/trinity/share/doc/kfouleggs/html
+/opt/trinity/share/doc/tde/HTML/en/kfouleggs /opt/trinity/share/doc/kfouleggs/html
diff --git a/ubuntu/maverick/tdegames/debian/kgoldrunner-trinity.install b/ubuntu/maverick/tdegames/debian/kgoldrunner-trinity.install
index 1da3a6d12..5283b997f 100644
--- a/ubuntu/maverick/tdegames/debian/kgoldrunner-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/kgoldrunner-trinity.install
@@ -7,6 +7,6 @@
 /opt/trinity/share/icons/hicolor/128x128/apps/kgoldrunner.png
 /opt/trinity/share/applications/kde/KGoldrunner.desktop
 /opt/trinity/games/kgoldrunner
-/opt/trinity/share/doc/kde/HTML/en/kgoldrunner/*
+/opt/trinity/share/doc/tde/HTML/en/kgoldrunner/*
 ../icons/kgoldrunner.xpm /opt/trinity/share/pixmaps
 ../icons/kgoldrunner-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegames/debian/kgoldrunner-trinity.links b/ubuntu/maverick/tdegames/debian/kgoldrunner-trinity.links
index 74cd1bf49..2a1164f25 100644
--- a/ubuntu/maverick/tdegames/debian/kgoldrunner-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/kgoldrunner-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kgoldrunner /opt/trinity/share/doc/kgoldrunner/html
+/opt/trinity/share/doc/tde/HTML/en/kgoldrunner /opt/trinity/share/doc/kgoldrunner/html
diff --git a/ubuntu/maverick/tdegames/debian/kjumpingcube-trinity.install b/ubuntu/maverick/tdegames/debian/kjumpingcube-trinity.install
index 6cb02d3b1..c5532b2f6 100644
--- a/ubuntu/maverick/tdegames/debian/kjumpingcube-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/kjumpingcube-trinity.install
@@ -8,6 +8,6 @@
 /opt/trinity/share/apps/kjumpingcube/*
 /opt/trinity/share/applications/kde/kjumpingcube.desktop
 /opt/trinity/share/config.kcfg/kjumpingcube.kcfg
-/opt/trinity/share/doc/kde/HTML/en/kjumpingcube/*
+/opt/trinity/share/doc/tde/HTML/en/kjumpingcube/*
 ../icons/kjumpingcube.xpm /opt/trinity/share/pixmaps
 ../icons/kjumpingcube-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegames/debian/kjumpingcube-trinity.links b/ubuntu/maverick/tdegames/debian/kjumpingcube-trinity.links
index 727dbd65e..037ef6838 100644
--- a/ubuntu/maverick/tdegames/debian/kjumpingcube-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/kjumpingcube-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kjumpingcube /opt/trinity/share/doc/kjumpingcube/html
+/opt/trinity/share/doc/tde/HTML/en/kjumpingcube /opt/trinity/share/doc/kjumpingcube/html
diff --git a/ubuntu/maverick/tdegames/debian/klickety-trinity.install b/ubuntu/maverick/tdegames/debian/klickety-trinity.install
index a05676246..65e89710d 100644
--- a/ubuntu/maverick/tdegames/debian/klickety-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/klickety-trinity.install
@@ -1,5 +1,5 @@
 /opt/trinity/games/klickety
-/opt/trinity/share/doc/kde/HTML/en/klickety/*
+/opt/trinity/share/doc/tde/HTML/en/klickety/*
 /opt/trinity/share/applications/kde/klickety.desktop
 /opt/trinity/share/icons/hicolor/16x16/apps/klickety.png
 /opt/trinity/share/icons/hicolor/22x22/apps/klickety.png
diff --git a/ubuntu/maverick/tdegames/debian/klickety-trinity.links b/ubuntu/maverick/tdegames/debian/klickety-trinity.links
index f034a8fbc..f281e2ba6 100644
--- a/ubuntu/maverick/tdegames/debian/klickety-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/klickety-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/klickety /opt/trinity/share/doc/klickety/html
+/opt/trinity/share/doc/tde/HTML/en/klickety /opt/trinity/share/doc/klickety/html
diff --git a/ubuntu/maverick/tdegames/debian/klines-trinity.install b/ubuntu/maverick/tdegames/debian/klines-trinity.install
index 4e6e39900..ba07a9752 100644
--- a/ubuntu/maverick/tdegames/debian/klines-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/klines-trinity.install
@@ -2,7 +2,7 @@
 /opt/trinity/share/applications/kde/klines.desktop
 /opt/trinity/games/klines
 /opt/trinity/share/config.kcfg/klines.kcfg
-/opt/trinity/share/doc/kde/HTML/en/klines/*
+/opt/trinity/share/doc/tde/HTML/en/klines/*
 /opt/trinity/share/icons/hicolor/128x128/apps/klines.png
 /opt/trinity/share/icons/hicolor/64x64/apps/klines.png
 /opt/trinity/share/icons/hicolor/48x48/apps/klines.png
diff --git a/ubuntu/maverick/tdegames/debian/klines-trinity.links b/ubuntu/maverick/tdegames/debian/klines-trinity.links
index cd7ab8182..2b00aeb3e 100644
--- a/ubuntu/maverick/tdegames/debian/klines-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/klines-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/klines /opt/trinity/share/doc/klines/html
+/opt/trinity/share/doc/tde/HTML/en/klines /opt/trinity/share/doc/klines/html
diff --git a/ubuntu/maverick/tdegames/debian/kmahjongg-trinity.install b/ubuntu/maverick/tdegames/debian/kmahjongg-trinity.install
index bc37d36a8..19b225795 100644
--- a/ubuntu/maverick/tdegames/debian/kmahjongg-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/kmahjongg-trinity.install
@@ -8,6 +8,6 @@
 /opt/trinity/share/applications/kde/kmahjongg.desktop
 /opt/trinity/games/kmahjongg
 /opt/trinity/share/config.kcfg/kmahjongg.kcfg
-/opt/trinity/share/doc/kde/HTML/en/kmahjongg/*
+/opt/trinity/share/doc/tde/HTML/en/kmahjongg/*
 ../icons/kmahjongg.xpm /opt/trinity/share/pixmaps
 ../icons/kmahjongg-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegames/debian/kmines-trinity.install b/ubuntu/maverick/tdegames/debian/kmines-trinity.install
index 7cf8afc8b..bcf5ee654 100644
--- a/ubuntu/maverick/tdegames/debian/kmines-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/kmines-trinity.install
@@ -7,6 +7,6 @@
 /opt/trinity/share/applications/kde/kmines.desktop
 /opt/trinity/share/apps/kmines/*
 /opt/trinity/games/kmines
-/opt/trinity/share/doc/kde/HTML/en/kmines/*
+/opt/trinity/share/doc/tde/HTML/en/kmines/*
 ../icons/kmines.xpm /opt/trinity/share/pixmaps
 ../icons/kmines-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegames/debian/kmines-trinity.links b/ubuntu/maverick/tdegames/debian/kmines-trinity.links
index aebb7ba09..d1d5a86fd 100644
--- a/ubuntu/maverick/tdegames/debian/kmines-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/kmines-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kmines /opt/trinity/share/doc/kmines/html
+/opt/trinity/share/doc/tde/HTML/en/kmines /opt/trinity/share/doc/kmines/html
diff --git a/ubuntu/maverick/tdegames/debian/kolf-trinity.install b/ubuntu/maverick/tdegames/debian/kolf-trinity.install
index beb920191..28eda8f6a 100644
--- a/ubuntu/maverick/tdegames/debian/kolf-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/kolf-trinity.install
@@ -2,7 +2,7 @@
 /opt/trinity/share/apps/kolf/*
 /opt/trinity/games/kolf
 /opt/trinity/share/applications/kde/kolf.desktop
-/opt/trinity/share/doc/kde/HTML/en/kolf/*
+/opt/trinity/share/doc/tde/HTML/en/kolf/*
 /opt/trinity/share/icons/hicolor/16x16/apps/kolf.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kolf.png
 /opt/trinity/share/icons/hicolor/32x32/apps/kolf.png
diff --git a/ubuntu/maverick/tdegames/debian/kolf-trinity.links b/ubuntu/maverick/tdegames/debian/kolf-trinity.links
index 6be814d36..8f0f830f5 100644
--- a/ubuntu/maverick/tdegames/debian/kolf-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/kolf-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kolf /opt/trinity/share/doc/kolf/html
+/opt/trinity/share/doc/tde/HTML/en/kolf /opt/trinity/share/doc/kolf/html
diff --git a/ubuntu/maverick/tdegames/debian/konquest-trinity.install b/ubuntu/maverick/tdegames/debian/konquest-trinity.install
index cb02ddf9f..d858d2e29 100644
--- a/ubuntu/maverick/tdegames/debian/konquest-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/konquest-trinity.install
@@ -7,6 +7,6 @@
 /opt/trinity/share/icons/hicolor/16x16/apps/konquest.png
 /opt/trinity/share/applications/kde/konquest.desktop
 /opt/trinity/games/konquest
-/opt/trinity/share/doc/kde/HTML/en/konquest/*
+/opt/trinity/share/doc/tde/HTML/en/konquest/*
 ../icons/konquest.xpm /opt/trinity/share/pixmaps
 ../icons/konquest-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegames/debian/konquest-trinity.links b/ubuntu/maverick/tdegames/debian/konquest-trinity.links
index 049977045..e57a10549 100644
--- a/ubuntu/maverick/tdegames/debian/konquest-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/konquest-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/konquest /opt/trinity/share/doc/konquest/html
+/opt/trinity/share/doc/tde/HTML/en/konquest /opt/trinity/share/doc/konquest/html
diff --git a/ubuntu/maverick/tdegames/debian/kpat-trinity.install b/ubuntu/maverick/tdegames/debian/kpat-trinity.install
index be6262cfc..1d7f45758 100644
--- a/ubuntu/maverick/tdegames/debian/kpat-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/kpat-trinity.install
@@ -7,6 +7,6 @@
 /opt/trinity/share/apps/kpat/*
 /opt/trinity/share/applications/kde/kpat.desktop
 /opt/trinity/games/kpat
-/opt/trinity/share/doc/kde/HTML/en/kpat/*
+/opt/trinity/share/doc/tde/HTML/en/kpat/*
 ../icons/kpat.xpm /opt/trinity/share/pixmaps
 ../icons/kpat-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegames/debian/kpat-trinity.links b/ubuntu/maverick/tdegames/debian/kpat-trinity.links
index 63773faa5..dbc291066 100644
--- a/ubuntu/maverick/tdegames/debian/kpat-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/kpat-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kpat /opt/trinity/share/doc/kpat/html
+/opt/trinity/share/doc/tde/HTML/en/kpat /opt/trinity/share/doc/kpat/html
diff --git a/ubuntu/maverick/tdegames/debian/kpoker-trinity.install b/ubuntu/maverick/tdegames/debian/kpoker-trinity.install
index 2ff64326c..0f499209c 100644
--- a/ubuntu/maverick/tdegames/debian/kpoker-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/kpoker-trinity.install
@@ -7,6 +7,6 @@
 /opt/trinity/share/icons/hicolor/16x16/apps/kpoker.png
 /opt/trinity/share/applications/kde/kpoker.desktop
 /opt/trinity/games/kpoker
-/opt/trinity/share/doc/kde/HTML/en/kpoker/*
+/opt/trinity/share/doc/tde/HTML/en/kpoker/*
 ../icons/kpoker.xpm /opt/trinity/share/pixmaps
 ../icons/kpoker-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegames/debian/kpoker-trinity.links b/ubuntu/maverick/tdegames/debian/kpoker-trinity.links
index 497c881db..8d789b45e 100644
--- a/ubuntu/maverick/tdegames/debian/kpoker-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/kpoker-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kpoker /opt/trinity/share/doc/kpoker/html
+/opt/trinity/share/doc/tde/HTML/en/kpoker /opt/trinity/share/doc/kpoker/html
diff --git a/ubuntu/maverick/tdegames/debian/kreversi-trinity.install b/ubuntu/maverick/tdegames/debian/kreversi-trinity.install
index 4d4af7c6b..981e8d7b0 100644
--- a/ubuntu/maverick/tdegames/debian/kreversi-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/kreversi-trinity.install
@@ -1,5 +1,5 @@
 /opt/trinity/games/kreversi
-/opt/trinity/share/doc/kde/HTML/en/kreversi/*
+/opt/trinity/share/doc/tde/HTML/en/kreversi/*
 /opt/trinity/share/applications/kde/kreversi.desktop
 /opt/trinity/share/apps/kreversi/*
 /opt/trinity/share/config.kcfg/kreversi.kcfg
diff --git a/ubuntu/maverick/tdegames/debian/kreversi-trinity.links b/ubuntu/maverick/tdegames/debian/kreversi-trinity.links
index 39f9a4267..ad5f17a8f 100644
--- a/ubuntu/maverick/tdegames/debian/kreversi-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/kreversi-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kreversi /opt/trinity/share/doc/kreversi/html
+/opt/trinity/share/doc/tde/HTML/en/kreversi /opt/trinity/share/doc/kreversi/html
diff --git a/ubuntu/maverick/tdegames/debian/ksame-trinity.install b/ubuntu/maverick/tdegames/debian/ksame-trinity.install
index 77203ce5a..1451960e7 100644
--- a/ubuntu/maverick/tdegames/debian/ksame-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/ksame-trinity.install
@@ -1,5 +1,5 @@
 /opt/trinity/games/ksame
-/opt/trinity/share/doc/kde/HTML/en/ksame/*
+/opt/trinity/share/doc/tde/HTML/en/ksame/*
 /opt/trinity/share/icons/hicolor/128x128/apps/ksame.png
 /opt/trinity/share/icons/hicolor/64x64/apps/ksame.png
 /opt/trinity/share/icons/hicolor/48x48/apps/ksame.png
diff --git a/ubuntu/maverick/tdegames/debian/ksame-trinity.links b/ubuntu/maverick/tdegames/debian/ksame-trinity.links
index 5e9578abd..09425a104 100644
--- a/ubuntu/maverick/tdegames/debian/ksame-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/ksame-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/ksame /opt/trinity/share/doc/ksame/html
+/opt/trinity/share/doc/tde/HTML/en/ksame /opt/trinity/share/doc/ksame/html
diff --git a/ubuntu/maverick/tdegames/debian/kshisen-trinity.install b/ubuntu/maverick/tdegames/debian/kshisen-trinity.install
index 1604ac2f5..b302633c0 100644
--- a/ubuntu/maverick/tdegames/debian/kshisen-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/kshisen-trinity.install
@@ -8,6 +8,6 @@
 /opt/trinity/share/icons/hicolor/16x16/apps/kshisen.png
 /opt/trinity/share/applications/kde/kshisen.desktop
 /opt/trinity/games/kshisen
-/opt/trinity/share/doc/kde/HTML/en/kshisen/*
+/opt/trinity/share/doc/tde/HTML/en/kshisen/*
 ../icons/kshisen.xpm /opt/trinity/share/pixmaps
 ../icons/kshisen-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegames/debian/kshisen-trinity.links b/ubuntu/maverick/tdegames/debian/kshisen-trinity.links
index 3035237df..ae00c9136 100644
--- a/ubuntu/maverick/tdegames/debian/kshisen-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/kshisen-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kshisen /opt/trinity/share/doc/kshisen/html
+/opt/trinity/share/doc/tde/HTML/en/kshisen /opt/trinity/share/doc/kshisen/html
diff --git a/ubuntu/maverick/tdegames/debian/ksirtet-trinity.install b/ubuntu/maverick/tdegames/debian/ksirtet-trinity.install
index 36f7a8a70..2de50860e 100644
--- a/ubuntu/maverick/tdegames/debian/ksirtet-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/ksirtet-trinity.install
@@ -8,6 +8,6 @@
 /opt/trinity/share/apps/ksirtet/*
 /opt/trinity/games/ksirtet
 /opt/trinity/share/config.kcfg/ksirtet.kcfg
-/opt/trinity/share/doc/kde/HTML/en/ksirtet/*
+/opt/trinity/share/doc/tde/HTML/en/ksirtet/*
 ../icons/ksirtet.xpm /opt/trinity/share/pixmaps
 ../icons/ksirtet-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegames/debian/ksirtet-trinity.links b/ubuntu/maverick/tdegames/debian/ksirtet-trinity.links
index e48818bb0..220128ee9 100644
--- a/ubuntu/maverick/tdegames/debian/ksirtet-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/ksirtet-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/ksirtet /opt/trinity/share/doc/ksirtet/html
+/opt/trinity/share/doc/tde/HTML/en/ksirtet /opt/trinity/share/doc/ksirtet/html
diff --git a/ubuntu/maverick/tdegames/debian/ksmiletris-trinity.install b/ubuntu/maverick/tdegames/debian/ksmiletris-trinity.install
index e1579993a..2db54f7ef 100644
--- a/ubuntu/maverick/tdegames/debian/ksmiletris-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/ksmiletris-trinity.install
@@ -7,6 +7,6 @@
 /opt/trinity/share/icons/hicolor/16x16/apps/ksmiletris.png
 /opt/trinity/share/applications/kde/ksmiletris.desktop
 /opt/trinity/games/ksmiletris
-/opt/trinity/share/doc/kde/HTML/en/ksmiletris/*
+/opt/trinity/share/doc/tde/HTML/en/ksmiletris/*
 ../icons/ksmiletris.xpm /opt/trinity/share/pixmaps
 ../icons/ksmiletris-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegames/debian/ksnake-trinity.install b/ubuntu/maverick/tdegames/debian/ksnake-trinity.install
index fdc5cb775..7f447dedb 100644
--- a/ubuntu/maverick/tdegames/debian/ksnake-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/ksnake-trinity.install
@@ -8,6 +8,6 @@
 /opt/trinity/share/icons/hicolor/16x16/apps/ksnake.png
 /opt/trinity/share/applications/kde/ksnake.desktop
 /opt/trinity/games/ksnake
-/opt/trinity/share/doc/kde/HTML/en/ksnake/*
+/opt/trinity/share/doc/tde/HTML/en/ksnake/*
 ../icons/ksnake.xpm /opt/trinity/share/pixmaps
 ../icons/ksnake-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegames/debian/ksnake-trinity.links b/ubuntu/maverick/tdegames/debian/ksnake-trinity.links
index 6bbe7f4ae..a790e936a 100644
--- a/ubuntu/maverick/tdegames/debian/ksnake-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/ksnake-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/ksnake /opt/trinity/share/doc/ksnake/html
+/opt/trinity/share/doc/tde/HTML/en/ksnake /opt/trinity/share/doc/ksnake/html
diff --git a/ubuntu/maverick/tdegames/debian/ksokoban-trinity.install b/ubuntu/maverick/tdegames/debian/ksokoban-trinity.install
index 889f279e6..00648dd8b 100644
--- a/ubuntu/maverick/tdegames/debian/ksokoban-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/ksokoban-trinity.install
@@ -6,6 +6,6 @@
 /opt/trinity/share/icons/hicolor/22x22/apps/ksokoban.png
 /opt/trinity/share/icons/hicolor/16x16/apps/ksokoban.png
 /opt/trinity/games/ksokoban
-/opt/trinity/share/doc/kde/HTML/en/ksokoban/*
+/opt/trinity/share/doc/tde/HTML/en/ksokoban/*
 ../icons/ksokoban.xpm /opt/trinity/share/pixmaps
 ../icons/ksokoban-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegames/debian/ksokoban-trinity.links b/ubuntu/maverick/tdegames/debian/ksokoban-trinity.links
index 0d9b23158..9930c3548 100644
--- a/ubuntu/maverick/tdegames/debian/ksokoban-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/ksokoban-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/ksokoban /opt/trinity/share/doc/ksokoban/html
+/opt/trinity/share/doc/tde/HTML/en/ksokoban /opt/trinity/share/doc/ksokoban/html
diff --git a/ubuntu/maverick/tdegames/debian/kspaceduel-trinity.install b/ubuntu/maverick/tdegames/debian/kspaceduel-trinity.install
index 949f8349e..559f89cdc 100644
--- a/ubuntu/maverick/tdegames/debian/kspaceduel-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/kspaceduel-trinity.install
@@ -8,6 +8,6 @@
 /opt/trinity/share/applications/kde/kspaceduel.desktop
 /opt/trinity/games/kspaceduel
 /opt/trinity/share/config.kcfg/kspaceduel.kcfg
-/opt/trinity/share/doc/kde/HTML/en/kspaceduel/*
+/opt/trinity/share/doc/tde/HTML/en/kspaceduel/*
 ../icons/kspaceduel.xpm /opt/trinity/share/pixmaps
 ../icons/kspaceduel-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegames/debian/kspaceduel-trinity.links b/ubuntu/maverick/tdegames/debian/kspaceduel-trinity.links
index 373ed3358..0182b926b 100644
--- a/ubuntu/maverick/tdegames/debian/kspaceduel-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/kspaceduel-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kspaceduel /opt/trinity/share/doc/kspaceduel/html
+/opt/trinity/share/doc/tde/HTML/en/kspaceduel /opt/trinity/share/doc/kspaceduel/html
diff --git a/ubuntu/maverick/tdegames/debian/ktron-trinity.install b/ubuntu/maverick/tdegames/debian/ktron-trinity.install
index 65e91b272..05bf663a5 100644
--- a/ubuntu/maverick/tdegames/debian/ktron-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/ktron-trinity.install
@@ -5,7 +5,7 @@
 /opt/trinity/share/icons/hicolor/48x48/apps/ktron.png
 /opt/trinity/share/icons/hicolor/64x64/apps/ktron.png
 /opt/trinity/share/icons/hicolor/128x128/apps/ktron.png
-/opt/trinity/share/doc/kde/HTML/en/ktron/*
+/opt/trinity/share/doc/tde/HTML/en/ktron/*
 /opt/trinity/share/applications/kde/ktron.desktop
 /opt/trinity/share/apps/ktron/*
 /opt/trinity/share/config.kcfg/ktron.kcfg
diff --git a/ubuntu/maverick/tdegames/debian/ktron-trinity.links b/ubuntu/maverick/tdegames/debian/ktron-trinity.links
index 9e2b81580..1d133ef86 100644
--- a/ubuntu/maverick/tdegames/debian/ktron-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/ktron-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/ktron /opt/trinity/share/doc/ktron/html
+/opt/trinity/share/doc/tde/HTML/en/ktron /opt/trinity/share/doc/ktron/html
diff --git a/ubuntu/maverick/tdegames/debian/ktuberling-trinity.install b/ubuntu/maverick/tdegames/debian/ktuberling-trinity.install
index fe7ff85de..098c979c8 100644
--- a/ubuntu/maverick/tdegames/debian/ktuberling-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/ktuberling-trinity.install
@@ -5,7 +5,7 @@
 /opt/trinity/share/icons/hicolor/32x32/apps/ktuberling.png
 /opt/trinity/share/icons/hicolor/22x22/apps/ktuberling.png
 /opt/trinity/share/icons/hicolor/16x16/apps/ktuberling.png
-/opt/trinity/share/doc/kde/HTML/en/ktuberling/*
+/opt/trinity/share/doc/tde/HTML/en/ktuberling/*
 /opt/trinity/share/applications/kde/ktuberling.desktop
 /opt/trinity/share/apps/ktuberling/*
 /opt/trinity/share/mimelnk/application/x-tuberling.desktop
diff --git a/ubuntu/maverick/tdegames/debian/ktuberling-trinity.links b/ubuntu/maverick/tdegames/debian/ktuberling-trinity.links
index 0d05ca2df..415a771ec 100644
--- a/ubuntu/maverick/tdegames/debian/ktuberling-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/ktuberling-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/ktuberling /opt/trinity/share/doc/ktuberling/html
+/opt/trinity/share/doc/tde/HTML/en/ktuberling /opt/trinity/share/doc/ktuberling/html
diff --git a/ubuntu/maverick/tdegames/debian/kwin4-trinity.install b/ubuntu/maverick/tdegames/debian/kwin4-trinity.install
index 143beeac9..265b1da77 100644
--- a/ubuntu/maverick/tdegames/debian/kwin4-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/kwin4-trinity.install
@@ -9,6 +9,6 @@
 /opt/trinity/share/icons/hicolor/22x22/apps/twin4.png
 /opt/trinity/share/icons/hicolor/16x16/apps/twin4.png
 /opt/trinity/share/applications/kde/twin4.desktop
-/opt/trinity/share/doc/kde/HTML/en/twin4/*
+/opt/trinity/share/doc/tde/HTML/en/twin4/*
 ../icons/twin4.xpm /opt/trinity/share/pixmaps
 ../icons/twin4-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdegames/debian/kwin4-trinity.links b/ubuntu/maverick/tdegames/debian/kwin4-trinity.links
index 1620ac717..9d620a1a3 100644
--- a/ubuntu/maverick/tdegames/debian/kwin4-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/kwin4-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/twin4 /opt/trinity/share/doc/twin4/html
+/opt/trinity/share/doc/tde/HTML/en/twin4 /opt/trinity/share/doc/twin4/html
diff --git a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.doc-base b/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.doc-base
index 9ccd1a018..209070551 100644
--- a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.doc-base
+++ b/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: This is the developers' API documentation for libtdegames.
 Section: Apps/Programming
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/tdegames-apidocs/index.html
-Files: /usr/share/doc/kde/HTML/en/tdegames-apidocs/*.html
+Index: /usr/share/doc/tde/HTML/en/tdegames-apidocs/index.html
+Files: /usr/share/doc/tde/HTML/en/tdegames-apidocs/*.html
diff --git a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.install b/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.install
index 1c5324c1c..d810407d1 100644
--- a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.install
+++ b/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.install
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/tdegames-apidocs
+/opt/trinity/share/doc/tde/HTML/en/tdegames-apidocs
diff --git a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.links b/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.links
index a935244a6..560445cbd 100644
--- a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.links
+++ b/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/tdegames-apidocs /opt/trinity/share/doc/libtdegames-doc/html
+/opt/trinity/share/doc/tde/HTML/en/tdegames-apidocs /opt/trinity/share/doc/libtdegames-doc/html
diff --git a/ubuntu/maverick/tdegames/debian/lskat-trinity.install b/ubuntu/maverick/tdegames/debian/lskat-trinity.install
index 4e3a24cad..7b301e9e0 100644
--- a/ubuntu/maverick/tdegames/debian/lskat-trinity.install
+++ b/ubuntu/maverick/tdegames/debian/lskat-trinity.install
@@ -1,6 +1,6 @@
 /opt/trinity/games/lskat
 /opt/trinity/games/lskatproc
-/opt/trinity/share/doc/kde/HTML/en/lskat/*
+/opt/trinity/share/doc/tde/HTML/en/lskat/*
 /opt/trinity/share/apps/lskat/*
 /opt/trinity/share/icons/hicolor/128x128/apps/lskat.png
 /opt/trinity/share/icons/hicolor/64x64/apps/lskat.png
diff --git a/ubuntu/maverick/tdegames/debian/lskat-trinity.links b/ubuntu/maverick/tdegames/debian/lskat-trinity.links
index 8948c6544..904bc2eab 100644
--- a/ubuntu/maverick/tdegames/debian/lskat-trinity.links
+++ b/ubuntu/maverick/tdegames/debian/lskat-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/lskat /opt/trinity/share/doc/lskat/html
+/opt/trinity/share/doc/tde/HTML/en/lskat /opt/trinity/share/doc/lskat/html
diff --git a/ubuntu/maverick/tdegames/debian/rules b/ubuntu/maverick/tdegames/debian/rules
index 5a24cd5ae..15b61b8c0 100755
--- a/ubuntu/maverick/tdegames/debian/rules
+++ b/ubuntu/maverick/tdegames/debian/rules
@@ -33,7 +33,7 @@ DEB_DH_MAKESHLIBS_ARGS_kolf-trinity := -V
 PACKAGES_WITH_LIBS := libtdegames1-trinity atlantik-trinity kolf-trinity
 
 common-binary-indep::
-	if ! test -d debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdegames-apidocs; then mv debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdegames-*apidocs debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdegames-apidocs; fi
+	if ! test -d debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdegames-apidocs; then mv debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdegames-*apidocs debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdegames-apidocs; fi
 
 common-binary-arch::
-	if ! test -d debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdegames-apidocs; then mv debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdegames-*apidocs debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdegames-apidocs; fi
+	if ! test -d debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdegames-apidocs; then mv debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdegames-*apidocs debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdegames-apidocs; fi
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.atlantik b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.atlantik
index ee45892f2..d5622da32 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.atlantik
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.atlantik
@@ -6,5 +6,5 @@ Abstract: Atlantik is a KDE client for playing Monopoly-like
 Section: Games/Board
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/atlantik/index.html
-Files: /usr/share/doc/kde/HTML/en/atlantik/*.html
+Index: /usr/share/doc/tde/HTML/en/atlantik/index.html
+Files: /usr/share/doc/tde/HTML/en/atlantik/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kasteroids b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kasteroids
index f93ce8ec9..70901cbe8 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kasteroids
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kasteroids
@@ -6,5 +6,5 @@ Abstract: KAsteroids is, as you would expect, the KDE clone of the
 Section: Games/Arcade
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kasteroids/index.html
-Files: /usr/share/doc/kde/HTML/en/kasteroids/*.html
+Index: /usr/share/doc/tde/HTML/en/kasteroids/index.html
+Files: /usr/share/doc/tde/HTML/en/kasteroids/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.katomic b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.katomic
index 3e161c90a..6d71f9ab5 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.katomic
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.katomic
@@ -5,5 +5,5 @@ Abstract: This Handbook describes KAtomic Version 2.0
 Section: Games/Puzzles
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/katomic/index.html
-Files: /usr/share/doc/kde/HTML/en/katomic/*.html
+Index: /usr/share/doc/tde/HTML/en/katomic/index.html
+Files: /usr/share/doc/tde/HTML/en/katomic/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbackgammon b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbackgammon
index 47c2a50e9..566681c61 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbackgammon
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbackgammon
@@ -8,5 +8,5 @@ Abstract: KBackgammon is a graphical backgammon program for KDE.
 Section: Games/Board
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kbackgammon/index.html
-Files: /usr/share/doc/kde/HTML/en/kbackgammon/*.html
+Index: /usr/share/doc/tde/HTML/en/kbackgammon/index.html
+Files: /usr/share/doc/tde/HTML/en/kbackgammon/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbattleship b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbattleship
index 9437f45e1..8f676a9d8 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbattleship
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbattleship
@@ -6,5 +6,5 @@ Abstract: KBattleship is a network-enabled implementation of the
 Section: Games/Board
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kbattleship/index.html
-Files: /usr/share/doc/kde/HTML/en/kbattleship/*.html
+Index: /usr/share/doc/tde/HTML/en/kbattleship/index.html
+Files: /usr/share/doc/tde/HTML/en/kbattleship/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kblackbox b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kblackbox
index 53af51018..aa22c016e 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kblackbox
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kblackbox
@@ -6,5 +6,5 @@ Abstract: KBlackbox is a superb graphical logical game, inspired by
 Section: Games/Puzzles
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kblackbox/index.html
-Files: /usr/share/doc/kde/HTML/en/kblackbox/*.html
+Index: /usr/share/doc/tde/HTML/en/kblackbox/index.html
+Files: /usr/share/doc/tde/HTML/en/kblackbox/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbounce b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbounce
index 649eb9013..019d15f87 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbounce
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbounce
@@ -5,5 +5,5 @@ Abstract: KBounce is a clone of Jezzball for KDE.
 Section: Games/Arcade
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kbounce/index.html
-Files: /usr/share/doc/kde/HTML/en/kbounce/*.html
+Index: /usr/share/doc/tde/HTML/en/kbounce/index.html
+Files: /usr/share/doc/tde/HTML/en/kbounce/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kenolaba b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kenolaba
index 92a0ef0a2..1afedaf84 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kenolaba
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kenolaba
@@ -6,5 +6,5 @@ Abstract: Kenolaba is a simple board strategy game that is played
 Section: Games/Board
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kenolaba/index.html
-Files: /usr/share/doc/kde/HTML/en/kenolaba/*.html
+Index: /usr/share/doc/tde/HTML/en/kenolaba/index.html
+Files: /usr/share/doc/tde/HTML/en/kenolaba/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kfouleggs b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kfouleggs
index 4531d2594..04f1ddc16 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kfouleggs
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kfouleggs
@@ -6,5 +6,5 @@ Abstract: KFouleggs is a clone of the Japanese PuyoPuyo game for
 Section: Games/Tetris-like
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kfouleggs/index.html
-Files: /usr/share/doc/kde/HTML/en/kfouleggs/*.html
+Index: /usr/share/doc/tde/HTML/en/kfouleggs/index.html
+Files: /usr/share/doc/tde/HTML/en/kfouleggs/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kgoldrunner b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kgoldrunner
index 877b94649..0fbde7a2b 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kgoldrunner
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kgoldrunner
@@ -7,5 +7,5 @@ Abstract: KGoldrunner, a game of action and puzzle solving.  Run through
 Section: Games/Arcade
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kgoldrunner/index.html
-Files: /usr/share/doc/kde/HTML/en/kgoldrunner/*.html
+Index: /usr/share/doc/tde/HTML/en/kgoldrunner/index.html
+Files: /usr/share/doc/tde/HTML/en/kgoldrunner/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kjumpingcube b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kjumpingcube
index defbf2266..089156088 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kjumpingcube
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kjumpingcube
@@ -6,5 +6,5 @@ Abstract: KJumpingcube is a simple tactical game you can play against
 Section: Games/Strategy
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kjumpingcube/index.html
-Files: /usr/share/doc/kde/HTML/en/kjumpingcube/*.html
+Index: /usr/share/doc/tde/HTML/en/kjumpingcube/index.html
+Files: /usr/share/doc/tde/HTML/en/kjumpingcube/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.klines b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.klines
index bed501b5a..7cb3a2a60 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.klines
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.klines
@@ -6,5 +6,5 @@ Abstract: KLines is a nice little game meant to amuse you for anywhere
 Section: Games/Board
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/klines/index.html
-Files: /usr/share/doc/kde/HTML/en/klines/*.html
+Index: /usr/share/doc/tde/HTML/en/klines/index.html
+Files: /usr/share/doc/tde/HTML/en/klines/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kmahjongg b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kmahjongg
index 8be9859a7..9651e3975 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kmahjongg
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kmahjongg
@@ -8,5 +8,5 @@ Abstract: KMahjongg is a KDE version of the famous oriental game Mahjongg.
 Section: Games/Board
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kmahjongg/index.html
-Files: /usr/share/doc/kde/HTML/en/kmahjongg/*.html
+Index: /usr/share/doc/tde/HTML/en/kmahjongg/index.html
+Files: /usr/share/doc/tde/HTML/en/kmahjongg/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kmines b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kmines
index dddfb5694..1845483c9 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kmines
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kmines
@@ -5,5 +5,5 @@ Abstract: KMines is the KDE version of the classic minesweeper game.
 Section: Games/Puzzles
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kmines/index.html
-Files: /usr/share/doc/kde/HTML/en/kmines/*.html
+Index: /usr/share/doc/tde/HTML/en/kmines/index.html
+Files: /usr/share/doc/tde/HTML/en/kmines/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kolf b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kolf
index 6703197fc..0821ab414 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kolf
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kolf
@@ -5,5 +5,5 @@ Abstract: Kolf is a miniature golf game for KDE.
 Section: Games/Arcade
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kolf/index.html
-Files: /usr/share/doc/kde/HTML/en/kolf/*.html
+Index: /usr/share/doc/tde/HTML/en/kolf/index.html
+Files: /usr/share/doc/tde/HTML/en/kolf/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.konquest b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.konquest
index fd6ce8557..dc011c860 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.konquest
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.konquest
@@ -6,5 +6,5 @@ Abstract: Konquest is a wonderfully complex game for universal
 Section: Games/Strategy
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/konquest/index.html
-Files: /usr/share/doc/kde/HTML/en/konquest/*.html
+Index: /usr/share/doc/tde/HTML/en/konquest/index.html
+Files: /usr/share/doc/tde/HTML/en/konquest/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kpat b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kpat
index 72e473ca5..757884bb5 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kpat
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kpat
@@ -5,5 +5,5 @@ Abstract: KPat is a highly addictive card game for KDE.
 Section: Games/Card
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kpat/index.html
-Files: /usr/share/doc/kde/HTML/en/kpat/*.html
+Index: /usr/share/doc/tde/HTML/en/kpat/index.html
+Files: /usr/share/doc/tde/HTML/en/kpat/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kpoker b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kpoker
index 8bc400d8f..804226064 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kpoker
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kpoker
@@ -5,5 +5,5 @@ Abstract: This is the helpfile of KPoker, a little poker game.
 Section: Games/Card
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kpoker/index.html
-Files: /usr/share/doc/kde/HTML/en/kpoker/*.html
+Index: /usr/share/doc/tde/HTML/en/kpoker/index.html
+Files: /usr/share/doc/tde/HTML/en/kpoker/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kreversi b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kreversi
index aba7df6b6..eeed02ada 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kreversi
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kreversi
@@ -5,5 +5,5 @@ Abstract: KReversi is a simple one player strategy game.
 Section: Games/Board
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kreversi/index.html
-Files: /usr/share/doc/kde/HTML/en/kreversi/*.html
+Index: /usr/share/doc/tde/HTML/en/kreversi/index.html
+Files: /usr/share/doc/tde/HTML/en/kreversi/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksame b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksame
index fc6543a2d..b81db0dc2 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksame
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksame
@@ -6,5 +6,5 @@ Abstract: KSame is a nice little program meant to amuse you for
 Section: Games/Puzzles
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/ksame/index.html
-Files: /usr/share/doc/kde/HTML/en/ksame/*.html
+Index: /usr/share/doc/tde/HTML/en/ksame/index.html
+Files: /usr/share/doc/tde/HTML/en/ksame/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kshisen b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kshisen
index 872725443..b713f3305 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kshisen
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kshisen
@@ -5,5 +5,5 @@ Abstract: This Handbook describes KShisen Version 1.3.
 Section: Games/Board
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kshisen/index.html
-Files: /usr/share/doc/kde/HTML/en/kshisen/*.html
+Index: /usr/share/doc/tde/HTML/en/kshisen/index.html
+Files: /usr/share/doc/tde/HTML/en/kshisen/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksirtet b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksirtet
index efa18f229..bbdaa1148 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksirtet
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksirtet
@@ -6,5 +6,5 @@ Abstract: This program is a clone of the well known game Tetris. You
 Section: Games/Tetris-like
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/ksirtet/index.html
-Files: /usr/share/doc/kde/HTML/en/ksirtet/*.html
+Index: /usr/share/doc/tde/HTML/en/ksirtet/index.html
+Files: /usr/share/doc/tde/HTML/en/ksirtet/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksnake b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksnake
index 475f2e786..c98f2f8ab 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksnake
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksnake
@@ -7,5 +7,5 @@ Abstract: Snake Race is a game of speed and agility. You are a hungry
 Section: Games/Arcade
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/ksnake/index.html
-Files: /usr/share/doc/kde/HTML/en/ksnake/*.html
+Index: /usr/share/doc/tde/HTML/en/ksnake/index.html
+Files: /usr/share/doc/tde/HTML/en/ksnake/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksokoban b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksokoban
index e6e7483f9..9f002fd0d 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksokoban
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksokoban
@@ -6,5 +6,5 @@ Abstract: KSokoban is a KDE implementation of the Japanese warehouse
 Section: Games/Puzzles
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/ksokoban/index.html
-Files: /usr/share/doc/kde/HTML/en/ksokoban/*.html
+Index: /usr/share/doc/tde/HTML/en/ksokoban/index.html
+Files: /usr/share/doc/tde/HTML/en/ksokoban/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kspaceduel b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kspaceduel
index 5018b8fef..ef41f0a6b 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kspaceduel
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kspaceduel
@@ -6,5 +6,5 @@ Abstract: KSpaceduel is a space arcade game. Two ships fly around the
 Section: Games/Arcade
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kspaceduel/index.html
-Files: /usr/share/doc/kde/HTML/en/kspaceduel/*.html
+Index: /usr/share/doc/tde/HTML/en/kspaceduel/index.html
+Files: /usr/share/doc/tde/HTML/en/kspaceduel/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ktron b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ktron
index 51339d525..13e2f887c 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ktron
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ktron
@@ -6,5 +6,5 @@ Abstract: KTron is a simple Tron close for KDE, which you can play
 Section: Games/Arcade
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/ktron/index.html
-Files: /usr/share/doc/kde/HTML/en/ktron/*.html
+Index: /usr/share/doc/tde/HTML/en/ktron/index.html
+Files: /usr/share/doc/tde/HTML/en/ktron/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ktuberling b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ktuberling
index 7689c3d04..9a37a4d26 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ktuberling
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ktuberling
@@ -5,5 +5,5 @@ Abstract: KTuberling is a game intended for small children.
 Section: Games/Toys
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/ktuberling/index.html
-Files: /usr/share/doc/kde/HTML/en/ktuberling/*.html
+Index: /usr/share/doc/tde/HTML/en/ktuberling/index.html
+Files: /usr/share/doc/tde/HTML/en/ktuberling/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kwin4 b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kwin4
index 09f2f43f3..273d4c727 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kwin4
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kwin4
@@ -5,5 +5,5 @@ Abstract: This documentation describes KWin4 version 1.0.0.
 Section: Games/Board
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/twin4/index.html
-Files: /usr/share/doc/kde/HTML/en/twin4/*.html
+Index: /usr/share/doc/tde/HTML/en/twin4/index.html
+Files: /usr/share/doc/tde/HTML/en/twin4/*.html
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.lskat b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.lskat
index cc162673e..0a6452e61 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.lskat
+++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.lskat
@@ -5,5 +5,5 @@ Abstract: This documentation describes Lskat version 0.9.1.
 Section: Games/Card
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/lskat/index.html
-Files: /usr/share/doc/kde/HTML/en/lskat/*.html
+Index: /usr/share/doc/tde/HTML/en/lskat/index.html
+Files: /usr/share/doc/tde/HTML/en/lskat/*.html
diff --git a/ubuntu/maverick/tdegraphics/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdegraphics/debian/cdbs/debian-qt-kde.mk
index a5e510758..a4e1eaef5 100644
--- a/ubuntu/maverick/tdegraphics/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdegraphics/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/tdegraphics/debian/cdbs/kde.mk b/ubuntu/maverick/tdegraphics/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/tdegraphics/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdegraphics/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/tdegraphics/debian/control b/ubuntu/maverick/tdegraphics/debian/control
index 1194864e4..dbaed8130 100644
--- a/ubuntu/maverick/tdegraphics/debian/control
+++ b/ubuntu/maverick/tdegraphics/debian/control
@@ -36,8 +36,8 @@ Description: KDE graphics documentation in HTML format
  HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /usr/share/doc/kde/HTML/<language>/<app>/, for instance
- /usr/share/doc/kde/HTML/en/kamera/. Documentation is provided for most
+ /usr/share/doc/tde/HTML/<language>/<app>/, for instance
+ /usr/share/doc/tde/HTML/en/kamera/. Documentation is provided for most
  KDE graphics packages.
  .
  This package is part of Trinity, and a component of the KDE graphics module.
diff --git a/ubuntu/maverick/tdegraphics/debian/control.in b/ubuntu/maverick/tdegraphics/debian/control.in
index 3a2b2e862..c0cf69366 100644
--- a/ubuntu/maverick/tdegraphics/debian/control.in
+++ b/ubuntu/maverick/tdegraphics/debian/control.in
@@ -32,8 +32,8 @@ Description: KDE graphics documentation in HTML format
  HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /usr/share/doc/kde/HTML/<language>/<app>/, for instance
- /usr/share/doc/kde/HTML/en/kamera/. Documentation is provided for most
+ /usr/share/doc/tde/HTML/<language>/<app>/, for instance
+ /usr/share/doc/tde/HTML/en/kamera/. Documentation is provided for most
  KDE graphics packages.
  .
  This package is part of KDE, and a component of the KDE graphics module.
diff --git a/ubuntu/maverick/tdegraphics/debian/kamera-trinity.install b/ubuntu/maverick/tdegraphics/debian/kamera-trinity.install
index 16f11dbf2..d1955c8f0 100644
--- a/ubuntu/maverick/tdegraphics/debian/kamera-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kamera-trinity.install
@@ -4,9 +4,9 @@ debian/tmp/opt/trinity/lib/trinity/kcm_kamera.so
 debian/tmp/opt/trinity/lib/trinity/kio_kamera.la
 debian/tmp/opt/trinity/lib/trinity/kio_kamera.so
 debian/tmp/opt/trinity/share/applications/kde/kamera.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kamera/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kamera/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kamera/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kamera/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kamera/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kamera/index.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/camera_test.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/camera.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/camera.png
diff --git a/ubuntu/maverick/tdegraphics/debian/kcoloredit-trinity.install b/ubuntu/maverick/tdegraphics/debian/kcoloredit-trinity.install
index 70f637e8d..d885d8ed8 100644
--- a/ubuntu/maverick/tdegraphics/debian/kcoloredit-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kcoloredit-trinity.install
@@ -3,9 +3,9 @@ debian/tmp/opt/trinity/bin/kcoloredit
 debian/tmp/opt/trinity/share/applications/kde/kcolorchooser.desktop
 debian/tmp/opt/trinity/share/applications/kde/kcoloredit.desktop
 debian/tmp/opt/trinity/share/apps/kcoloredit/kcoloreditui.rc
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcoloredit/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcoloredit/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcoloredit/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcoloredit/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcoloredit/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcoloredit/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kcolorchooser.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kcoloredit.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kcolorchooser.png
diff --git a/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.install b/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.install
index 288ee8fed..b0170ca7c 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.install
@@ -6,17 +6,17 @@ debian/tmp/opt/trinity/share/apps/kdvi/kdvi_part.rc
 debian/tmp/opt/trinity/share/apps/kdvi/kviewshell.rc
 debian/tmp/opt/trinity/share/apps/kdvi/tips
 debian/tmp/opt/trinity/share/config.kcfg/kdvi.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/aboutkde.ps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/KDVI-features.dvi
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/KDVI-features.tex
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/kdvi-search.el
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/optionrequester1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/optionrequester2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/srcltx.sty
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdvi/srctex.sty
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/aboutkde.ps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/KDVI-features.dvi
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/KDVI-features.tex
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/kdvi-search.el
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/optionrequester1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/optionrequester2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/srcltx.sty
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdvi/srctex.sty
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kdvi.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kdvi.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kdvi.png
diff --git a/ubuntu/maverick/tdegraphics/debian/kgamma-trinity.install b/ubuntu/maverick/tdegraphics/debian/kgamma-trinity.install
index 4da99e829..4b4875ac9 100644
--- a/ubuntu/maverick/tdegraphics/debian/kgamma-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kgamma-trinity.install
@@ -9,9 +9,9 @@ debian/tmp/opt/trinity/share/apps/kgamma/pics/greyscale.png
 debian/tmp/opt/trinity/share/apps/kgamma/pics/lightgrey.png
 debian/tmp/opt/trinity/share/apps/kgamma/pics/midgrey.png
 debian/tmp/opt/trinity/share/apps/kgamma/pics/rgbscale.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kgamma/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kgamma/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kgamma/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kgamma/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kgamma/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kgamma/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kgamma.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kgamma.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kgamma.png
diff --git a/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.install b/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.install
index 8bb376a3c..b967faccf 100644
--- a/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.install
@@ -10,9 +10,9 @@ debian/tmp/opt/trinity/share/apps/kghostview/kghostviewui.rc
 debian/tmp/opt/trinity/share/apps/kghostview/kgv_part.rc
 debian/tmp/opt/trinity/share/apps/kghostview/pdf_sec.ps
 debian/tmp/opt/trinity/share/config.kcfg/kghostview.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kghostview/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kghostview/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kghostview/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kghostview/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kghostview/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kghostview/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kghostview.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kghostview.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kghostview.png
diff --git a/ubuntu/maverick/tdegraphics/debian/kiconedit-trinity.install b/ubuntu/maverick/tdegraphics/debian/kiconedit-trinity.install
index ee15c189c..66bf9a180 100644
--- a/ubuntu/maverick/tdegraphics/debian/kiconedit-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kiconedit-trinity.install
@@ -28,10 +28,10 @@ debian/tmp/opt/trinity/share/apps/kiconedit/pics/source.png
 debian/tmp/opt/trinity/share/apps/kiconedit/pics/standard.png
 debian/tmp/opt/trinity/share/apps/kiconedit/pics/transform.png
 debian/tmp/opt/trinity/share/apps/kiconedit/pics/window_new.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kiconedit/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kiconedit/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kiconedit/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kiconedit/kiconedit-configuration.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/kiconedit-configuration.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kiconedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kiconedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kiconedit.png
diff --git a/ubuntu/maverick/tdegraphics/debian/kolourpaint-trinity.install b/ubuntu/maverick/tdegraphics/debian/kolourpaint-trinity.install
index d081a577f..3ee0f1de8 100644
--- a/ubuntu/maverick/tdegraphics/debian/kolourpaint-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kolourpaint-trinity.install
@@ -110,58 +110,58 @@ debian/tmp/opt/trinity/share/apps/kolourpaint/pics/smooth_scale.png
 debian/tmp/opt/trinity/share/apps/kolourpaint/pics/tool_spraycan_17x17.png
 debian/tmp/opt/trinity/share/apps/kolourpaint/pics/tool_spraycan_29x29.png
 debian/tmp/opt/trinity/share/apps/kolourpaint/pics/tool_spraycan_9x9.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/brush_shapes.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/color_box.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/eraser_shapes.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/fcc_std_text.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/fcc_trans_text.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/fill_color_similarity.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/fill_style.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/image_balance.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/image_emboss.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/image_flatten.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/image_flip.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/image_invert.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/image_reduce_colors.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/image_resize_scale.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/image_rotate.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/image_skew.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/image_soften_sharpen.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/kolourpaint-main.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/line_width.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/lines_30_45_deg.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/lines_30_deg.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/lines_45_deg.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/rotate_image_30.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/rotate_selection_30.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/selections_opaque_transparent.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/spraycan_patterns.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/text_zoom_grid.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_brush.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_color_picker.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_color_washer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_curve.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_ellipse.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_elliptical_selection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_eraser.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_flood_fill.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_free_form_selection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_line.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_pen.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_polygon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_polyline.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_polystar.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_rect_selection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_rectangle.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_rectangles.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_rounded_rectangle.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_selections.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_spraycan.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/tool_text.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kolourpaint/view_thumbnails.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/brush_shapes.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/color_box.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/eraser_shapes.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/fcc_std_text.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/fcc_trans_text.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/fill_color_similarity.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/fill_style.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/image_balance.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/image_emboss.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/image_flatten.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/image_flip.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/image_invert.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/image_reduce_colors.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/image_resize_scale.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/image_rotate.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/image_skew.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/image_soften_sharpen.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/kolourpaint-main.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/line_width.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/lines_30_45_deg.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/lines_30_deg.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/lines_45_deg.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/rotate_image_30.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/rotate_selection_30.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/selections_opaque_transparent.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/spraycan_patterns.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/text_zoom_grid.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_brush.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_color_picker.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_color_washer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_curve.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_ellipse.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_elliptical_selection.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_eraser.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_flood_fill.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_free_form_selection.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_line.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_pen.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_polygon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_polyline.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_polystar.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_rect_selection.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_rectangle.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_rectangles.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_rounded_rectangle.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_selections.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_spraycan.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/tool_text.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kolourpaint/view_thumbnails.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kolourpaint.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kolourpaint.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kolourpaint.png
diff --git a/ubuntu/maverick/tdegraphics/debian/kooka-trinity.install b/ubuntu/maverick/tdegraphics/debian/kooka-trinity.install
index 38d064424..958395531 100644
--- a/ubuntu/maverick/tdegraphics/debian/kooka-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kooka-trinity.install
@@ -15,18 +15,18 @@ debian/tmp/opt/trinity/share/apps/kooka/pics/scaleorig.png
 debian/tmp/opt/trinity/share/apps/kooka/pics/scaletoheight.png
 debian/tmp/opt/trinity/share/apps/kooka/pics/scaletowidth.png
 debian/tmp/opt/trinity/share/apps/kooka/pics/thumbviewtile.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/kooka_gocr.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/kooka_gocr_result.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/kooka_mainctrl.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/ocr-select.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/shortcut0.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/shortcut1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/toolbar.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/toolbar1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kooka/toolbar2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/kooka_gocr.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/kooka_gocr_result.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/kooka_mainctrl.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/ocr-select.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/shortcut0.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/shortcut1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/toolbar.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/toolbar1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/toolbar2.png
 
 debian/icons/kooka.xpm		/usr/share/pixmaps
 debian/icons/kooka-16.xpm	/usr/share/pixmaps
diff --git a/ubuntu/maverick/tdegraphics/debian/kpdf-trinity.install b/ubuntu/maverick/tdegraphics/debian/kpdf-trinity.install
index 29584fa07..85cde09a4 100644
--- a/ubuntu/maverick/tdegraphics/debian/kpdf-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kpdf-trinity.install
@@ -5,10 +5,10 @@ debian/tmp/opt/trinity/share/applications/kde/kpdf.desktop
 debian/tmp/opt/trinity/share/apps/kpdf/shell.rc
 debian/tmp/opt/trinity/share/apps/kpdfpart/part.rc
 debian/tmp/opt/trinity/share/config.kcfg/kpdf.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpdf/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpdf/configure.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpdf/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpdf/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpdf/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpdf/configure.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpdf/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpdf/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kpdf.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kpdf.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kpdf.png
diff --git a/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.install b/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.install
index 84b6083ef..d0e50b60a 100644
--- a/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.install
@@ -362,58 +362,58 @@ debian/tmp/opt/trinity/share/apps/kpovmodeler/kpovmodelershell.rc
 debian/tmp/opt/trinity/share/apps/kpovmodeler/kpovmodelerui.rc
 debian/tmp/opt/trinity/share/apps/kpovmodeler/povraydocmap.xml
 debian/tmp/opt/trinity/share/apps/kpovmodeler/questionmark.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cameraview.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/controlpoints.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmcamera.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmcolorlist.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmfinish.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pminterior.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmlight.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmpigment.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmplane.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmrender.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmsolidcolor.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmsphere.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/defaultviewlayout.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/dockwidget.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/dockwidgettab.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/insertaspopup.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/objectpropertiesview.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/objecttree.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/rendericon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/rendermodeoutput.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/rendermodequality.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/rendermodesize.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/rendermodesselection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/rendermodestoolbar.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/rendersettingsicon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/renderwindow.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/texturepreview.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/topview.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-camera-dialog.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-camera-graphic.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-final-render.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-color-list.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-pigment.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-render.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-solid-color-1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-solid-color-2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-wrong-colors-render.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-light-dialog.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-light-graphic.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-plane-dialog.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-plane-graphic.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-plane-tree-expanded.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-plane-tree-translate.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-dialog.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-finish-dialog.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-render-finish.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-render-nocolor.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-render-solidcolor.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-solid-color.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cameraview.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/controlpoints.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cr22-action-pmcamera.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cr22-action-pmcolorlist.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cr22-action-pmfinish.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cr22-action-pminterior.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cr22-action-pmlight.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cr22-action-pmpigment.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cr22-action-pmplane.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cr22-action-pmrender.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cr22-action-pmsolidcolor.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/cr22-action-pmsphere.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/defaultviewlayout.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/dockwidget.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/dockwidgettab.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/insertaspopup.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/objectpropertiesview.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/objecttree.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/rendericon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/rendermodeoutput.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/rendermodequality.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/rendermodesize.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/rendermodesselection.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/rendermodestoolbar.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/rendersettingsicon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/renderwindow.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/texturepreview.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/topview.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-camera-dialog.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-camera-graphic.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-final-render.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-ground-color-list.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-ground-pigment.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-ground-render.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-ground-solid-color-1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-ground-solid-color-2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-ground-wrong-colors-render.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-light-dialog.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-light-graphic.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-plane-dialog.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-plane-graphic.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-plane-tree-expanded.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-plane-tree-translate.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-sphere-dialog.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-sphere-finish-dialog.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-sphere-render-finish.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-sphere-render-nocolor.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-sphere-render-solidcolor.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpovmodeler/tutorial01-sphere-solid-color.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kpovmodeler.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kpovmodeler.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kpovmodeler.png
diff --git a/ubuntu/maverick/tdegraphics/debian/kruler-trinity.install b/ubuntu/maverick/tdegraphics/debian/kruler-trinity.install
index b39d5a2e0..9256c231a 100644
--- a/ubuntu/maverick/tdegraphics/debian/kruler-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kruler-trinity.install
@@ -7,9 +7,9 @@ debian/tmp/opt/trinity/share/apps/kruler/pics/kruler-north.png
 debian/tmp/opt/trinity/share/apps/kruler/pics/kruler-south.png
 debian/tmp/opt/trinity/share/apps/kruler/pics/kruler-west.png
 debian/tmp/opt/trinity/share/apps/kruler/sounds/move.wav
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kruler/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kruler/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kruler/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kruler/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kruler/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kruler/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kruler.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kruler.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kruler.png
diff --git a/ubuntu/maverick/tdegraphics/debian/ksnapshot-trinity.install b/ubuntu/maverick/tdegraphics/debian/ksnapshot-trinity.install
index 460875310..4b83732a3 100644
--- a/ubuntu/maverick/tdegraphics/debian/ksnapshot-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/ksnapshot-trinity.install
@@ -1,10 +1,10 @@
 debian/tmp/opt/trinity/bin/ksnapshot
 debian/tmp/opt/trinity/share/applications/kde/ksnapshot.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksnapshot/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksnapshot/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksnapshot/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksnapshot/preview.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksnapshot/window.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksnapshot/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksnapshot/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksnapshot/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksnapshot/preview.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksnapshot/window.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/ksnapshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/ksnapshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/ksnapshot.png
diff --git a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.install b/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.install
index d9ef57977..24e372536 100644
--- a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.install
@@ -13,10 +13,10 @@ debian/tmp/opt/trinity/share/apps/kuickshow/pics/ksslide.png
 debian/tmp/opt/trinity/share/apps/kuickshow/pics/kuickshow-day.jpg
 debian/tmp/opt/trinity/share/apps/kuickshow/pics/kuickshow-night.jpg
 debian/tmp/opt/trinity/share/apps/kuickshow/pics/logo.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kuickshow/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kuickshow/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kuickshow/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kuickshow/screenshot.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuickshow/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuickshow/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuickshow/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuickshow/screenshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kuickshow.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kuickshow.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kuickshow.png
@@ -24,7 +24,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kuickshow.png
 debian/icons/kuickshow.xpm		/usr/share/pixmaps
 debian/icons/kuickshow-16.xpm		/usr/share/pixmaps
 
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kuickshow/screenshot.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kuickshow/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kuickshow/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kuickshow/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuickshow/screenshot.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuickshow/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuickshow/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuickshow/index.docbook
diff --git a/ubuntu/maverick/tdegraphics/debian/kview-trinity.install b/ubuntu/maverick/tdegraphics/debian/kview-trinity.install
index ca570ad61..31348d439 100644
--- a/ubuntu/maverick/tdegraphics/debian/kview-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kview-trinity.install
@@ -41,11 +41,11 @@ debian/tmp/opt/trinity/share/apps/kviewviewer/kviewpopup.rc
 debian/tmp/opt/trinity/share/apps/kviewviewer/kviewviewer.rc
 debian/tmp/opt/trinity/share/apps/kviewviewer/kviewviewer_ro.rc
 debian/tmp/opt/trinity/share/apps/photobook/photobookui.rc
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kview/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kview/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kview/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kview/kview-application-configuration.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kview/kview-viewer-configuration.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kview/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kview/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kview/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kview/kview-application-configuration.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kview/kview-viewer-configuration.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/photobook.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/photobook.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kview.png
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera
index aac5b9e11..9744eea09 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera
@@ -5,6 +5,6 @@ Abstract: Kamera allows you to view and download images on a digital camera.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kamera/index.html
-Files: /usr/share/doc/kde/HTML/en/kamera/*.html
+Index: /usr/share/doc/tde/HTML/en/kamera/index.html
+Files: /usr/share/doc/tde/HTML/en/kamera/*.html
 
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit
index a11e55ce0..df40b406f 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit
@@ -6,6 +6,6 @@ Abstract: KColorEdit is a palette files editor. It can be used for editing
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kcoloredit/index.html
-Files: /usr/share/doc/kde/HTML/en/kcoloredit/*.html
+Index: /usr/share/doc/tde/HTML/en/kcoloredit/index.html
+Files: /usr/share/doc/tde/HTML/en/kcoloredit/*.html
 
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi
index b509a2764..a46da2bc7 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi
@@ -5,6 +5,6 @@ Abstract: This program and KPart allow the user to display *.DVI files from TeX.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kdvi/index.html
-Files: /usr/share/doc/kde/HTML/en/kdvi/*.html
+Index: /usr/share/doc/tde/HTML/en/kdvi/index.html
+Files: /usr/share/doc/tde/HTML/en/kdvi/*.html
 
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma
index 77ec2c8cd..b8adfa6ba 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma
@@ -5,6 +5,6 @@ Abstract: KGamma is a simple tool for monitor gamma correction.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kgamma/index.html
-Files: /usr/share/doc/kde/HTML/en/kgamma/*.html
+Index: /usr/share/doc/tde/HTML/en/kgamma/index.html
+Files: /usr/share/doc/tde/HTML/en/kgamma/*.html
 
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview
index d94829129..d365eafa1 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview
@@ -6,6 +6,6 @@ Abstract: KGhostView displays and prints PostScript and
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kghostview/index.html
-Files: /usr/share/doc/kde/HTML/en/kghostview/*.html
+Index: /usr/share/doc/tde/HTML/en/kghostview/index.html
+Files: /usr/share/doc/tde/HTML/en/kghostview/*.html
 
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kiconedit b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kiconedit
index 26753ee1a..c5c527997 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kiconedit
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kiconedit
@@ -6,6 +6,6 @@ Abstract: KIconEdit is designed to help create icons for KDE using the
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kiconedit/index.html
-Files: /usr/share/doc/kde/HTML/en/kiconedit/*.html
+Index: /usr/share/doc/tde/HTML/en/kiconedit/index.html
+Files: /usr/share/doc/tde/HTML/en/kiconedit/*.html
 
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint
index c687d4648..1a60665dd 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint
@@ -5,6 +5,6 @@ Abstract: KolourPaint is a free, easy-to-use paint program for KDE.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kolourpaint/index.html
-Files: /usr/share/doc/kde/HTML/en/kolourpaint/*.html
+Index: /usr/share/doc/tde/HTML/en/kolourpaint/index.html
+Files: /usr/share/doc/tde/HTML/en/kolourpaint/*.html
 
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka
index 457a34ca1..08c036a2c 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka
@@ -5,6 +5,6 @@ Abstract: Kooka is a very useful KDE scanning application.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kooka/index.html
-Files: /usr/share/doc/kde/HTML/en/kooka/*.html
+Index: /usr/share/doc/tde/HTML/en/kooka/index.html
+Files: /usr/share/doc/tde/HTML/en/kooka/*.html
 
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf
index 46300c860..973881af0 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf
@@ -5,6 +5,6 @@ Abstract: KPDF is a KDE PDF viewer based on xpdf code.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kpdf/index.html
-Files: /usr/share/doc/kde/HTML/en/kpdf/*.html
+Index: /usr/share/doc/tde/HTML/en/kpdf/index.html
+Files: /usr/share/doc/tde/HTML/en/kpdf/*.html
 
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler
index db0540150..7138b349e 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler
@@ -6,6 +6,6 @@ Abstract: KPovModeler is a graphical 3D modeler, which can generate
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kpovmodeler/index.html
-Files: /usr/share/doc/kde/HTML/en/kpovmodeler/*.html
+Index: /usr/share/doc/tde/HTML/en/kpovmodeler/index.html
+Files: /usr/share/doc/tde/HTML/en/kpovmodeler/*.html
 
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler
index 1ae465ddd..2984a7153 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler
@@ -5,6 +5,6 @@ Abstract: KRuler can be used to measure objects on the screen.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kruler/index.html
-Files: /usr/share/doc/kde/HTML/en/kruler/*.html
+Index: /usr/share/doc/tde/HTML/en/kruler/index.html
+Files: /usr/share/doc/tde/HTML/en/kruler/*.html
 
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot
index b104ba9ef..12a4246a6 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot
@@ -5,6 +5,6 @@ Abstract: KSnapshot is a simple applet for taking screenshots.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/ksnapshot/index.html
-Files: /usr/share/doc/kde/HTML/en/ksnapshot/*.html
+Index: /usr/share/doc/tde/HTML/en/ksnapshot/index.html
+Files: /usr/share/doc/tde/HTML/en/ksnapshot/*.html
 
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow
index 5c43d6b57..6eed1e216 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow
@@ -5,6 +5,6 @@ Abstract: KuickShow is a comfortable image browser/viewer.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kuickshow/index.html
-Files: /usr/share/doc/kde/HTML/en/kuickshow/*.html
+Index: /usr/share/doc/tde/HTML/en/kuickshow/index.html
+Files: /usr/share/doc/tde/HTML/en/kuickshow/*.html
 
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview
index f79993dfb..acca821b9 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview
@@ -5,6 +5,6 @@ Abstract: KView is an image viewing program.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kview/index.html
-Files: /usr/share/doc/kde/HTML/en/kview/*.html
+Index: /usr/share/doc/tde/HTML/en/kview/index.html
+Files: /usr/share/doc/tde/HTML/en/kview/*.html
 
diff --git a/ubuntu/maverick/tdelibs/debian/cdbs/kde.mk b/ubuntu/maverick/tdelibs/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/tdelibs/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdelibs/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog
index d75004323..2969809e6 100644
--- a/ubuntu/maverick/tdelibs/debian/changelog
+++ b/ubuntu/maverick/tdelibs/debian/changelog
@@ -3765,7 +3765,7 @@ tdelibs-cvs (4:2.0-19990903-1.0) experimental; urgency=low
 tdelibs-cvs (4:2.0-19990823-1.0) experimental; urgency=low
 
   * More CVS updates
-  * Adding in a process to the postinst to verify that /usr/doc/kde/HTML/default
+  * Adding in a process to the postinst to verify that /usr/doc/tde/HTML/default
     is a link and not a directory
   * Removing ldconfig from postrm
 
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
index 6cd2a864c..fd084886c 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
@@ -1725,64 +1725,64 @@ debian/tmp/opt/trinity/share/apps/LICENSES/LGPL_V2
 debian/tmp/opt/trinity/share/apps/LICENSES/QPL_V1.0
 debian/tmp/opt/trinity/share/apps/proxyscout/eventsrc
 debian/tmp/opt/trinity/share/autostart/kab2kabc.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/10.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/4.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/5.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/6.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/7.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/8.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/9.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/appheader.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/artistic-license.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/bottom1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/bottom2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/bottom-left.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/bottom-middle.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/bottom-right.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/bsd-license.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/docheadergears.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/doctop1a.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/doctop1b.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/doctop1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/doctop2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/doxygen.css
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/favicon.ico
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/fdl-license
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/fdl-license.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/fdl-notice.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/footer.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/gpl-license
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/gpl-license.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/grad.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/headerbg.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/header.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/kde-common.css
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/kde-default.css
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/kde_gear_64.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/kde-localised.css.template
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/kde_logo_bg.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/kde_logo.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/kde-web.css
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/kmenu.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/lgpl-license
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/lgpl-license.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/mainfooter.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/mainheader.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/qpl-license.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/shadow.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/top-left.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/top-middle.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/top-right-konqueror.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/web-docbottom.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/web-doctop.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/x11-license.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/xml.dcl
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kspell/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kspell/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kspell/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/10.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/4.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/5.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/6.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/7.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/8.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/9.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/appheader.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/artistic-license.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom-left.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom-middle.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom-right.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bsd-license.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/docheadergears.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/doctop1a.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/doctop1b.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/doctop1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/doctop2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/doxygen.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/favicon.ico
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/fdl-license
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/fdl-license.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/fdl-notice.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/footer.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/gpl-license
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/gpl-license.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/grad.png
+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/kde-common.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde-default.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/kde-localised.css.template
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_logo_bg.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_logo.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde-web.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kmenu.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/lgpl-license
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/lgpl-license.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/mainfooter.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/mainheader.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/qpl-license.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/shadow.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-left.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-middle.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-right-konqueror.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-docbottom.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-doctop.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/x11-license.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/xml.dcl
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/index.docbook
 debian/tmp/opt/trinity/share/emoticons/Default/angry.png
 debian/tmp/opt/trinity/share/emoticons/Default/bat.png
 debian/tmp/opt/trinity/share/emoticons/Default/beer.png
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-doc.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-doc.install
index c45e2a51e..71ae7f63f 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-doc.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-doc.install
@@ -1 +1 @@
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdelibs-apidocs/*
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdelibs-apidocs/*
diff --git a/ubuntu/maverick/tdemultimedia/debian/artsbuilder-trinity.install b/ubuntu/maverick/tdemultimedia/debian/artsbuilder-trinity.install
index cb250d3b7..b3f11c769 100644
--- a/ubuntu/maverick/tdemultimedia/debian/artsbuilder-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/artsbuilder-trinity.install
@@ -235,73 +235,73 @@ debian/tmp/opt/trinity/share/apps/artsbuilder/pics/Synth_XFADE.xpm
 debian/tmp/opt/trinity/share/apps/artscontrol/artscontrol.rc
 debian/tmp/opt/trinity/share/apps/artscontrol/artsmidimanagerview.rc
 debian/tmp/opt/trinity/share/apps/kicker/applets/artscontrolapplet.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/apis.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/artsbuilder.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/arts-structure.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/detail.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/digitalaudio.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/faq.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/future.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/glossary.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/gui.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/helping.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Doc_MODUL.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Gui_AUDIO_MANAGER.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Gui_INSTRUMENT_MAPPER.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Gui_LABEL.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Gui_MIXER.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Gui_PANEL.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Gui_POTI.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Gui_SLIDER.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Gui_SUBPANEL.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Gui_WINDOW.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Interface_MIDI_NOTE.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/schema1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/schema2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/schema3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/schema4.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_ADD.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_ATAN_SATURATE.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_BUS_DOWNLINK.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_BUS_UPLINK.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_CDELAY.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_COMPRESSOR.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_DEBUG.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_DELAY.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_DIV.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_ENVELOPE_ADSR.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_FILEPLAY.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_FM_SOURCE.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_FREQUENCY.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_MIDI_DEBUG.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_MIDI_ROUTER.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_MUL.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_NIL.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY_AKAI.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY_AKAIS.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY_WAV.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_PSCALE.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_RC.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_SEQUENCE_FREQ.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_SEQUENCE.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_SHELVE_CUTOFF.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_STD_EQUALIZER.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_STRUCT_KILL.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_WAVE_SIN.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_WAVE_SQUARE.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_WAVE_TRI.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/images/Synth_XFADE.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/mcop.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/midi.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/midiintro.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/modules.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/porting.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/references.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/artsbuilder/tools.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/apis.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/artsbuilder.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/arts-structure.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/detail.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/digitalaudio.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/faq.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/future.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/glossary.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/gui.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/helping.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Doc_MODUL.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Gui_AUDIO_MANAGER.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Gui_INSTRUMENT_MAPPER.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Gui_LABEL.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Gui_MIXER.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Gui_PANEL.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Gui_POTI.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Gui_SLIDER.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Gui_SUBPANEL.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Gui_WINDOW.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Interface_MIDI_NOTE.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/schema1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/schema2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/schema3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/schema4.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_ADD.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_ATAN_SATURATE.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_BUS_DOWNLINK.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_BUS_UPLINK.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_CDELAY.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_COMPRESSOR.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_DEBUG.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_DELAY.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_DIV.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_ENVELOPE_ADSR.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_FILEPLAY.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_FM_SOURCE.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_FREQUENCY.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_MIDI_DEBUG.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_MIDI_ROUTER.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_MUL.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_NIL.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_PLAY_AKAI.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_PLAY_AKAIS.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_PLAY.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_PLAY_WAV.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_PSCALE.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_RC.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_SEQUENCE_FREQ.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_SEQUENCE.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_SHELVE_CUTOFF.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_STD_EQUALIZER.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_STRUCT_KILL.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_WAVE_SIN.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_WAVE_SQUARE.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_WAVE_TRI.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/images/Synth_XFADE.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/mcop.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/midi.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/midiintro.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/modules.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/porting.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/references.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/artsbuilder/tools.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/actions/artsaudiomanager.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/actions/artsenvironment.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/actions/artsfftscope.png
diff --git a/ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk
index cae625265..d135c4257 100644
--- a/ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk b/ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/tdemultimedia/debian/control b/ubuntu/maverick/tdemultimedia/debian/control
index 6cdd95e02..9e6b8adb2 100644
--- a/ubuntu/maverick/tdemultimedia/debian/control
+++ b/ubuntu/maverick/tdemultimedia/debian/control
@@ -52,8 +52,8 @@ Description: Trinity multimedia documentation in HTML format
  HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /opt/trinity/share/doc/kde/HTML/<language>/<app>/, for instance
- /opt/trinity/share/doc/kde/HTML/en/juk/. Documentation is provided for most
+ /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
+ /opt/trinity/share/doc/tde/HTML/en/juk/. Documentation is provided for most
  KDE multimedia packages.
  .
  This package is part of Trinity, and a component of the KDE multimedia module.
diff --git a/ubuntu/maverick/tdemultimedia/debian/control.in b/ubuntu/maverick/tdemultimedia/debian/control.in
index 2e7c1c0ba..4193a1d20 100644
--- a/ubuntu/maverick/tdemultimedia/debian/control.in
+++ b/ubuntu/maverick/tdemultimedia/debian/control.in
@@ -47,8 +47,8 @@ Description: KDE multimedia documentation in HTML format
  HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /opt/trinity/share/doc/kde/HTML/<language>/<app>/, for instance
- /opt/trinity/share/doc/kde/HTML/en/juk/. Documentation is provided for most
+ /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
+ /opt/trinity/share/doc/tde/HTML/en/juk/. Documentation is provided for most
  KDE multimedia packages.
  .
  This package is part of KDE, and a component of the KDE multimedia module.
diff --git a/ubuntu/maverick/tdemultimedia/debian/juk-trinity.install b/ubuntu/maverick/tdemultimedia/debian/juk-trinity.install
index 1d7a2a99e..39ffc23e4 100644
--- a/ubuntu/maverick/tdemultimedia/debian/juk-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/juk-trinity.install
@@ -5,17 +5,17 @@ debian/tmp/opt/trinity/share/apps/juk/jukui.rc
 debian/tmp/opt/trinity/share/apps/juk/pics/playing.png
 debian/tmp/opt/trinity/share/apps/juk/pics/splash.png
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/jukservicemenu.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/juk/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/juk/history-playlist.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/juk/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/juk/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/juk/juk-adv-search.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/juk/juk-file-renamer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/juk/juk-main.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/juk/juk-tag-guesser.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/juk/normal-playlist.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/juk/search-playlist.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/juk/toolbar.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/juk/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/juk/history-playlist.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/juk/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/juk/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/juk/juk-adv-search.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/juk/juk-file-renamer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/juk/juk-main.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/juk/juk-tag-guesser.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/juk/normal-playlist.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/juk/search-playlist.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/juk/toolbar.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/juk_dock.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/juk.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/juk.png
diff --git a/ubuntu/maverick/tdemultimedia/debian/kaboodle-trinity.install b/ubuntu/maverick/tdemultimedia/debian/kaboodle-trinity.install
index 65cda92a3..dbf9019c1 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kaboodle-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/kaboodle-trinity.install
@@ -6,9 +6,9 @@ debian/tmp/opt/trinity/share/apps/kaboodle/icons/crystalsvg/16x16/actions/kabood
 debian/tmp/opt/trinity/share/apps/kaboodle/icons/crystalsvg/22x22/actions/kaboodleloop.png
 debian/tmp/opt/trinity/share/apps/kaboodle/kaboodlepartui.rc
 debian/tmp/opt/trinity/share/apps/kaboodle/kaboodleui.rc
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaboodle/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaboodle/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaboodle/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaboodle/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaboodle/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaboodle/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kaboodle.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kaboodle.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kaboodle.png
diff --git a/ubuntu/maverick/tdemultimedia/debian/kaudiocreator-trinity.install b/ubuntu/maverick/tdemultimedia/debian/kaudiocreator-trinity.install
index 836ec812c..a21cdff62 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kaudiocreator-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/kaudiocreator-trinity.install
@@ -9,28 +9,28 @@ debian/tmp/opt/trinity/share/apps/kconf_update/upgrade-kaudiocreator-metadata.sh
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/audiocd_extract.desktop
 debian/tmp/opt/trinity/share/config.kcfg/kaudiocreator.kcfg
 debian/tmp/opt/trinity/share/config.kcfg/kaudiocreator_encoders.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/rippingandencoding2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/cddbconfigurationlookup.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/cdconfiguration.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/startalbumeditor.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/lameconfiguration.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/rippingandencoding.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/readytorip.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/confirmartistcarryover.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/encodernotfound.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/generalconfiguration.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/jobshavestarted.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/cdinserted.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/encoderconfiguration.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/entersong1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/setalbumcategory.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/jobcontrol.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/kaudiocreatormainwindow800.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/ripperconfiguration.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kaudiocreator/cddbconfigurationsubmit.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/rippingandencoding2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/cddbconfigurationlookup.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/cdconfiguration.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/startalbumeditor.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/lameconfiguration.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/rippingandencoding.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/readytorip.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/confirmartistcarryover.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/encodernotfound.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/generalconfiguration.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/jobshavestarted.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/cdinserted.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/encoderconfiguration.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/entersong1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/setalbumcategory.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/jobcontrol.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/kaudiocreatormainwindow800.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/ripperconfiguration.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kaudiocreator/cddbconfigurationsubmit.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kaudiocreator.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kaudiocreator.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kaudiocreator.png
diff --git a/ubuntu/maverick/tdemultimedia/debian/kmid-trinity.install b/ubuntu/maverick/tdemultimedia/debian/kmid-trinity.install
index 2bd425d0a..00d66fa05 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kmid-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/kmid-trinity.install
@@ -27,9 +27,9 @@ debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaPSR500.map
 debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaPSS790.map
 debian/tmp/opt/trinity/share/apps/kmid/maps/YamahaQY10.map
 debian/tmp/opt/trinity/share/apps/kmid/maps/gm.map
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmid/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmid/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmid/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmid/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmid.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmid.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kmid.png
diff --git a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.install b/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.install
index 79dfc1cef..46b045f6f 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.install
@@ -36,12 +36,12 @@ debian/tmp/opt/trinity/share/apps/kmix/pics/mix_unknown.png
 debian/tmp/opt/trinity/share/apps/kmix/pics/mix_video.png
 debian/tmp/opt/trinity/share/apps/kmix/pics/mix_volume.png
 debian/tmp/opt/trinity/share/autostart/restore_kmix_volumes.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmix/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmix/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmix/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmix/kmix-channel-playback.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmix/kmix-channel-record.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmix/kmix-window.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmix/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmix/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmix/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmix/kmix-channel-playback.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmix/kmix-channel-record.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmix/kmix-window.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kmix.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmix.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmix.png
@@ -52,4 +52,4 @@ debian/tmp/opt/trinity/share/services/kmixctrl_restore.desktop
 debian/icons/kmix.xpm		/opt/trinity/share/pixmaps
 debian/icons/kmix-16.xpm	/opt/trinity/share/pixmaps
 
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmix/kmix-channel-switches.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmix/kmix-channel-switches.png
diff --git a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.install b/ubuntu/maverick/tdemultimedia/debian/krec-trinity.install
index bbb4ed25f..ce6a15bfa 100644
--- a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/krec-trinity.install
@@ -19,13 +19,13 @@ debian/tmp/opt/trinity/share/apps/krec/icons/crystalsvg/32x32/mimetypes/krec_fil
 debian/tmp/opt/trinity/share/apps/krec/icons/crystalsvg/32x32/mimetypes/krec_filerec.png
 debian/tmp/opt/trinity/share/apps/krec/krecui.rc
 debian/tmp/opt/trinity/share/apps/krec/tips
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krec/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krec/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krec/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krec/krec-configuration.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krec/krec-hicolor.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krec/krec-keramik.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krec/krec-new_file_properties.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krec/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krec/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krec/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krec/krec-configuration.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krec/krec-hicolor.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krec/krec-keramik.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krec/krec-new_file_properties.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/krec.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/krec.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/krec.png
diff --git a/ubuntu/maverick/tdemultimedia/debian/kscd-trinity.install b/ubuntu/maverick/tdemultimedia/debian/kscd-trinity.install
index 0761c2f92..f1e5b53d8 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kscd-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/kscd-trinity.install
@@ -5,23 +5,23 @@ debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/audiocd_play.desktop
 debian/tmp/opt/trinity/share/apps/kscd/icons/crystalsvg/22x22/actions/cdsmall.png
 debian/tmp/opt/trinity/share/apps/profiles/kscd.profile.xml
 debian/tmp/opt/trinity/share/config.kcfg/kscd.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kscd/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kscd/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kscd/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kscd/kscd.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kscd/kscdannounc.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kscd/kscd11.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kscd/kscd12.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kscd/kscd13.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kscd/kscd14.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kscd/kscd16.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kscd/kscd18.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kscd/kscd19.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kscd/kscd2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kscd/kscd3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kscd/kscd5.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kscd/kscd6.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kscd/kscd9.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kscd/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kscd/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kscd/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kscd/kscd.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kscd/kscdannounc.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kscd/kscd11.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kscd/kscd12.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kscd/kscd13.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kscd/kscd14.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kscd/kscd16.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kscd/kscd18.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kscd/kscd19.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kscd/kscd2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kscd/kscd3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kscd/kscd5.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kscd/kscd6.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kscd/kscd9.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kscd.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kscd.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kscd.png
diff --git a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.install b/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.install
index e7b22e4e0..195e387b0 100644
--- a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.install
@@ -314,9 +314,9 @@ debian/tmp/opt/trinity/share/apps/noatun/systrayui.rc
 debian/tmp/opt/trinity/share/apps/noatun/voiceprint.plugin
 debian/tmp/opt/trinity/share/apps/noatun/winskin.plugin
 debian/tmp/opt/trinity/share/apps/noatun/yhconfig.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/noatun/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/noatun/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/noatun/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/noatun/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/noatun/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/noatun/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/noatun.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/noatun.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/noatun.png
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.artsbuilder b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.artsbuilder
index 48208dcd9..22dec6526 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.artsbuilder
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.artsbuilder
@@ -5,6 +5,6 @@ Abstract: This handbook describes aRts, the Analog Real-time Synthesizer.
 Section: Apps/Sound
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/artsbuilder/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/artsbuilder/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/artsbuilder/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/artsbuilder/*.html
 
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.juk b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.juk
index 1d63a8b50..4d56243c2 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.juk
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.juk
@@ -5,6 +5,6 @@ Abstract: Juk is a jukebox, tagger and music collection manager.
 Section: Apps/Music
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/juk/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/juk/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/juk/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/juk/*.html
 
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kaboodle b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kaboodle
index 73c36debf..2ec2f33ab 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kaboodle
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kaboodle
@@ -5,6 +5,6 @@ Abstract: Kaboodle is a one file quick media player for KDE.
 Section: Apps/Sound
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kaboodle/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kaboodle/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kaboodle/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kaboodle/*.html
 
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid
index 3317f0489..0d5dc5893 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmid
@@ -5,6 +5,6 @@ Abstract: KMid is a midi/karaoke multimedia player for KDE.
 Section: Apps/Music
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kmid/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kmid/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kmid/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kmid/*.html
 
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmix b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmix
index 6aca2e181..cf57cbde4 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmix
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmix
@@ -7,6 +7,6 @@ Abstract: KMix is an application to allow you to change the volume of
 Section: Apps/Sound
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kmix/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kmix/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kmix/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kmix/*.html
 
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.krec b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.krec
index 525a78717..79a5e454b 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.krec
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.krec
@@ -5,6 +5,6 @@ Abstract: KRec is a sound recording application for aRts and KDE.
 Section: Apps/Sound
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/krec/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/krec/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/krec/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/krec/*.html
 
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kscd b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kscd
index 8eec58fbb..ad86a8341 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kscd
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kscd
@@ -6,6 +6,6 @@ Abstract: KsCD is a small, fast, CDDB-enabled audio CD player for KDE.
 Section: Apps/Music
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kscd/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kscd/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kscd/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kscd/*.html
 
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.noatun b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.noatun
index 08444da31..841551248 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.noatun
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.noatun
@@ -5,6 +5,6 @@ Abstract: NoAtun is a fully-featured plugin-based media player for KDE.
 Section: Apps/Sound
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/noatun/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/noatun/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/noatun/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/noatun/*.html
 
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install
index 6f28fe72e..9f7c1bd94 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kio-plugins-trinity.install
@@ -17,5 +17,5 @@ debian/tmp/opt/trinity/share/apps/kconf_update/audiocd.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/upgrade-metadata.sh
 debian/tmp/opt/trinity/share/config.kcfg/audiocd_lame_encoder.kcfg
 debian/tmp/opt/trinity/share/config.kcfg/audiocd_vorbis_encoder.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kioslave/audiocd.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kioslave/audiocd.docbook
 debian/tmp/opt/trinity/share/services/audiocd.protocol
diff --git a/ubuntu/maverick/tdenetwork/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdenetwork/debian/cdbs/debian-qt-kde.mk
index cae625265..d135c4257 100644
--- a/ubuntu/maverick/tdenetwork/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdenetwork/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk b/ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/tdenetwork/debian/control b/ubuntu/maverick/tdenetwork/debian/control
index c4715735c..56250ac6f 100644
--- a/ubuntu/maverick/tdenetwork/debian/control
+++ b/ubuntu/maverick/tdenetwork/debian/control
@@ -54,8 +54,8 @@ Description: Trinity network documentation in HTML format
  HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /opt/trinity/share/doc/kde/HTML/<language>/<app>/, for instance
- /opt/trinity/share/doc/kde/HTML/en/kdict/. Documentation is provided for most
+ /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
+ /opt/trinity/share/doc/tde/HTML/en/kdict/. Documentation is provided for most
  KDE network packages.
  .
  This package is part of KDE, and a component of the KDE network module.
diff --git a/ubuntu/maverick/tdenetwork/debian/control.in b/ubuntu/maverick/tdenetwork/debian/control.in
index 9c545a27b..a158974ed 100644
--- a/ubuntu/maverick/tdenetwork/debian/control.in
+++ b/ubuntu/maverick/tdenetwork/debian/control.in
@@ -48,8 +48,8 @@ Description: KDE network documentation in HTML format
  HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /opt/trinity/share/doc/kde/HTML/<language>/<app>/, for instance
- /opt/trinity/share/doc/kde/HTML/en/kdict/. Documentation is provided for most
+ /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
+ /opt/trinity/share/doc/tde/HTML/en/kdict/. Documentation is provided for most
  KDE network packages.
  .
  This package is part of KDE, and a component of the KDE network module.
diff --git a/ubuntu/maverick/tdenetwork/debian/kdict-trinity.install b/ubuntu/maverick/tdenetwork/debian/kdict-trinity.install
index 281f24270..5486cfa17 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdict-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/kdict-trinity.install
@@ -11,13 +11,13 @@ debian/tmp/opt/trinity/share/apps/kdict/icons/crystalsvg/22x22/actions/define_cl
 debian/tmp/opt/trinity/share/apps/kdict/icons/crystalsvg/32x32/actions/define_clip.png
 debian/tmp/opt/trinity/share/apps/kdict/kdictui.rc
 debian/tmp/opt/trinity/share/apps/kicker/applets/kdictapplet.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdict/applet.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdict/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdict/conf.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdict/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdict/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdict/mainwin.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdict/seteditor.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdict/applet.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdict/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdict/conf.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdict/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdict/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdict/mainwin.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdict/seteditor.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kdict.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kdict.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kdict.png
diff --git a/ubuntu/maverick/tdenetwork/debian/kget-trinity.install b/ubuntu/maverick/tdenetwork/debian/kget-trinity.install
index 8e508722e..697f16e2e 100644
--- a/ubuntu/maverick/tdenetwork/debian/kget-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/kget-trinity.install
@@ -55,15 +55,15 @@ debian/tmp/opt/trinity/share/apps/kget/pics/try7.png
 debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/kget_plug_in.desktop
 debian/tmp/opt/trinity/share/apps/khtml/kpartplugins/kget_plug_in.rc
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kget_download.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kget/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kget/fileopen.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kget/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kget/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kget/kget1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kget/kget2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kget/kget3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kget/kget4.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kget/kget5.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/fileopen.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/kget1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/kget2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/kget3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/kget4.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kget/kget5.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kget.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kget_list.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/khtml_kget.png
diff --git a/ubuntu/maverick/tdenetwork/debian/knewsticker-trinity.install b/ubuntu/maverick/tdenetwork/debian/knewsticker-trinity.install
index b7b2aa7c4..aa4b90edc 100644
--- a/ubuntu/maverick/tdenetwork/debian/knewsticker-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/knewsticker-trinity.install
@@ -9,28 +9,28 @@ debian/tmp/opt/trinity/share/apps/kconf_update/knewsticker.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/knt-0.1-0.2.pl
 debian/tmp/opt/trinity/share/apps/kicker/applets/knewsticker.desktop
 debian/tmp/opt/trinity/share/apps/knewsticker/eventsrc
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/TODO
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/about-icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/checknews-icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/contextmenu.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/help-icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/kcmnewsticker-filters.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/kcmnewsticker-general.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/kcmnewsticker-newssitedialog.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/kcmnewsticker-newssources.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/kcmnewsticker-scrollerprefs.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/kcontrol-icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/knewsticker-childpanel.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/knewsticker-icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/knewsticker-kicker.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/knewsticker-ownwindow.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/newarticle-icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/newssite-icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/oldarticle-icon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/knewsticker/preferences-icon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/TODO
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/about-icon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/checknews-icon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/contextmenu.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/help-icon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/kcmnewsticker-filters.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/kcmnewsticker-general.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/kcmnewsticker-newssitedialog.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/kcmnewsticker-newssources.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/kcmnewsticker-scrollerprefs.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/kcontrol-icon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/knewsticker-childpanel.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/knewsticker-icon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/knewsticker-kicker.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/knewsticker-ownwindow.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/newarticle-icon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/newssite-icon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/oldarticle-icon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/knewsticker/preferences-icon.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/knewsticker.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/knewsticker.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/knewsticker.png
diff --git a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.install b/ubuntu/maverick/tdenetwork/debian/kopete-trinity.install
index 1901f005e..b75374a5b 100644
--- a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/kopete-trinity.install
@@ -301,11 +301,11 @@ debian/tmp/opt/trinity/share/config.kcfg/kopeteidentityconfigpreferences.kcfg
 debian/tmp/opt/trinity/share/config.kcfg/kopete.kcfg
 debian/tmp/opt/trinity/share/config.kcfg/latexconfig.kcfg
 debian/tmp/opt/trinity/share/config.kcfg/nowlisteningconfig.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kopete/chatstyle.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kopete/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kopete/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kopete/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kopete/menus.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kopete/chatstyle.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kopete/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kopete/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kopete/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kopete/menus.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/actions/voicecall.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/actions/webcamreceive.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/actions/webcamsend.png
diff --git a/ubuntu/maverick/tdenetwork/debian/kpf-trinity.install b/ubuntu/maverick/tdenetwork/debian/kpf-trinity.install
index 1ea904b80..34db30cb4 100644
--- a/ubuntu/maverick/tdenetwork/debian/kpf-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/kpf-trinity.install
@@ -3,9 +3,9 @@ debian/tmp/opt/trinity/lib/trinity/kpf_panelapplet.so
 debian/tmp/opt/trinity/lib/trinity/kpfpropertiesdialog.la
 debian/tmp/opt/trinity/lib/trinity/kpfpropertiesdialog.so
 debian/tmp/opt/trinity/share/apps/kicker/applets/kpfapplet.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpf/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpf/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpf/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpf/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpf/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpf/index.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kpf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kpf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kpf.png
diff --git a/ubuntu/maverick/tdenetwork/debian/kppp-trinity.install b/ubuntu/maverick/tdenetwork/debian/kppp-trinity.install
index 1eb241f38..3e4f063f4 100644
--- a/ubuntu/maverick/tdenetwork/debian/kppp-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/kppp-trinity.install
@@ -492,38 +492,38 @@ debian/tmp/opt/trinity/share/apps/kppp/Rules/Yugoslavia/III_zona-preko_200km.rst
 debian/tmp/opt/trinity/share/apps/kppp/Rules/Yugoslavia/II_zona-do_200km.rst
 debian/tmp/opt/trinity/share/apps/kppp/Rules/Yugoslavia/I_zona-ista_mreza.rst
 debian/tmp/opt/trinity/share/apps/kppp/Rules/Yugoslavia/Lokalni_poziv.rst
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/accounting.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/callback.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/chap.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/costsgraphs.fig
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/costsgraphs.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/dialog-setup.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/getting-online.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/global-settings.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/hayes.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/kppp-account-accounting-tab.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/kppp-account-dial-tab.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/kppp-account-dns-tab.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/kppp-account-execute-tab.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/kppp-account-gateway-tab.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/kppp-account-ip-tab.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/kppp-account-login-script-tab.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/kppp-config.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/kppp-device-tab.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/kppp-dialler-tab.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/kppp-faq.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/kppp.faq.question
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/kppp-graph-tab.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/kppp-misc-tab.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/kppp-modem-tab.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/kppp-wizard.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/security.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/tricks.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/ttyS-cua.txt
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kppp/wizard.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/accounting.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/callback.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/chap.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/costsgraphs.fig
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/costsgraphs.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/dialog-setup.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/getting-online.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/global-settings.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/hayes.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-account-accounting-tab.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-account-dial-tab.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-account-dns-tab.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-account-execute-tab.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-account-gateway-tab.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-account-ip-tab.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-account-login-script-tab.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-config.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-device-tab.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-dialler-tab.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-faq.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp.faq.question
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-graph-tab.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-misc-tab.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-modem-tab.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/kppp-wizard.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/security.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/tricks.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/ttyS-cua.txt
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kppp/wizard.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kppp.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kppp.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kppp.png
diff --git a/ubuntu/maverick/tdenetwork/debian/krdc-trinity.install b/ubuntu/maverick/tdenetwork/debian/krdc-trinity.install
index ff1bd9c5f..ea0a5284a 100644
--- a/ubuntu/maverick/tdenetwork/debian/krdc-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/krdc-trinity.install
@@ -7,30 +7,30 @@ debian/tmp/opt/trinity/share/apps/krdc/pics/pindown.png
 debian/tmp/opt/trinity/share/apps/krdc/pics/pinup.png
 debian/tmp/opt/trinity/share/apps/krdc/pics/pointcursor.png
 debian/tmp/opt/trinity/share/apps/krdc/pics/pointcursormask.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/authentication.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/authentication.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/close.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/krdc_window.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/krdc_window.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/preferences_profilestab.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/preferences_profilestab.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/preferences_rdpdefaultstab.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/preferences_rdpdefaultstab.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/preferences_vncdefaultstab.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/preferences_vncdefaultstab.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/snapshot.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/snapshot.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/snapshot_connectionspeed.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/snapshot_connectionspeed.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/snapshot_nobrowse.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/snapshot_nobrowse.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/snapshot_vncentry.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/snapshot_vncentry.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/window_fullscreen.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krdc/window_nofullscreen.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/authentication.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/authentication.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/close.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/krdc_window.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/krdc_window.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/preferences_profilestab.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/preferences_profilestab.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/preferences_rdpdefaultstab.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/preferences_rdpdefaultstab.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/preferences_vncdefaultstab.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/preferences_vncdefaultstab.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/snapshot.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/snapshot.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/snapshot_connectionspeed.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/snapshot_connectionspeed.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/snapshot_nobrowse.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/snapshot_nobrowse.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/snapshot_vncentry.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/snapshot_vncentry.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/window_fullscreen.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krdc/window_nofullscreen.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/krdc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/krdc.png
 debian/tmp/opt/trinity/share/services/rdp.protocol
diff --git a/ubuntu/maverick/tdenetwork/debian/krfb-trinity.install b/ubuntu/maverick/tdenetwork/debian/krfb-trinity.install
index 5bae6725b..f14235846 100644
--- a/ubuntu/maverick/tdenetwork/debian/krfb-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/krfb-trinity.install
@@ -11,25 +11,25 @@ debian/tmp/opt/trinity/share/apps/krfb/eventsrc
 debian/tmp/opt/trinity/share/apps/krfb/pics/connection-side-image.png
 debian/tmp/opt/trinity/share/apps/krfb/pics/eyes-closed24.png
 debian/tmp/opt/trinity/share/apps/krfb/pics/eyes-open24.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krfb/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krfb/configuration_access.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krfb/configuration_access.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krfb/configuration_network.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krfb/configuration_network.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krfb/configuration_session.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krfb/configuration_session.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krfb/connection.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krfb/connection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krfb/email_invitation.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krfb/email_invitation.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krfb/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krfb/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krfb/invitation_management.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krfb/invitation_management.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krfb/personal_invitation.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krfb/personal_invitation.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krfb/screenshot.eps
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/krfb/screenshot.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/configuration_access.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/configuration_access.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/configuration_network.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/configuration_network.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/configuration_session.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/configuration_session.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/connection.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/connection.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/email_invitation.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/email_invitation.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/invitation_management.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/invitation_management.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/personal_invitation.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/personal_invitation.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/screenshot.eps
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/krfb/screenshot.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/krfb.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/krfb.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/krfb.png
diff --git a/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.install b/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.install
index 3c1146978..0492f8ebf 100644
--- a/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.install
@@ -76,9 +76,9 @@ debian/tmp/opt/trinity/share/apps/ksirc/relnotes
 debian/tmp/opt/trinity/share/apps/ksirc/servers.ini
 debian/tmp/opt/trinity/share/apps/ksirc/servers.txt
 debian/tmp/opt/trinity/share/apps/ksirc/sirc.help.gz
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksirc/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksirc/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksirc/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksirc/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksirc/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksirc/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/ksirc.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/ksirc.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/ksirc.png
diff --git a/ubuntu/maverick/tdenetwork/debian/ktalkd-trinity.install b/ubuntu/maverick/tdenetwork/debian/ktalkd-trinity.install
index 4206a1618..607417afa 100644
--- a/ubuntu/maverick/tdenetwork/debian/ktalkd-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/ktalkd-trinity.install
@@ -4,12 +4,12 @@ debian/tmp/opt/trinity/bin/mail.local
 debian/tmp/opt/trinity/lib/trinity/kcm_ktalkd.la
 debian/tmp/opt/trinity/lib/trinity/kcm_ktalkd.so
 debian/tmp/opt/trinity/share/applications/kde/kcmktalkd.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmtalkd/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmtalkd/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmtalkd/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ktalkd/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ktalkd/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ktalkd/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtalkd/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtalkd/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtalkd/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ktalkd/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ktalkd/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ktalkd/index.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/ktalkd.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/ktalkd.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/ktalkd.png
diff --git a/ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.install b/ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.install
index ce735f6fa..b14b1c99b 100644
--- a/ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.install
@@ -19,9 +19,9 @@ debian/tmp/opt/trinity/share/apps/kwifimanager/pics/no_card.png
 debian/tmp/opt/trinity/share/apps/kwifimanager/pics/offline.png
 debian/tmp/opt/trinity/share/apps/kwifimanager/pics/oor_down.png
 debian/tmp/opt/trinity/share/apps/kwifimanager/pics/oor_minimum.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kwifimanager/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kwifimanager/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kwifimanager/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwifimanager/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwifimanager/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwifimanager/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kwifimanager.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kwifimanager.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kwifimanager.png
diff --git a/ubuntu/maverick/tdenetwork/debian/lisa-trinity.install b/ubuntu/maverick/tdenetwork/debian/lisa-trinity.install
index e6a53ecf2..1a75e64db 100644
--- a/ubuntu/maverick/tdenetwork/debian/lisa-trinity.install
+++ b/ubuntu/maverick/tdenetwork/debian/lisa-trinity.install
@@ -9,12 +9,12 @@ debian/tmp/opt/trinity/share/apps/konqsidebartng/virtual_folders/services/lisa.d
 debian/tmp/opt/trinity/share/apps/konqueror/dirtree/remote/lan.desktop
 debian/tmp/opt/trinity/share/apps/lisa/README
 debian/tmp/opt/trinity/share/apps/remoteview/lan.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/lanbrowser/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/lanbrowser/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/lanbrowser/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/lisa/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/lisa/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/lisa/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/lanbrowser/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/lanbrowser/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/lanbrowser/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/lisa/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/lisa/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/lisa/index.docbook
 debian/tmp/opt/trinity/share/services/lan.protocol
 debian/tmp/opt/trinity/share/services/rlan.protocol
 
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kdict b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kdict
index 7d68d39ea..8cd75880f 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kdict
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kdict
@@ -6,6 +6,6 @@ Abstract: KDict is a graphical client for the DICT protocol. It enables you
 Section: Apps/Text
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kdict/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kdict/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kdict/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kdict/*.html
 
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kget b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kget
index 69371bfcc..0e5e6bd35 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kget
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kget
@@ -5,6 +5,6 @@ Abstract: KGet allows you to group and manage downloads.
 Section: Apps/Web
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kget/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kget/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kget/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kget/*.html
 
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.knewsticker b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.knewsticker
index 246e1b35e..5ae2f7e7a 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.knewsticker
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.knewsticker
@@ -5,6 +5,6 @@ Abstract: KNewsTicker is a news ticker applet for the KDE panel.
 Section: Apps/Web
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/knewsticker/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/knewsticker/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/knewsticker/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/knewsticker/*.html
 
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kopete b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kopete
index 1eaf82262..12beee936 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kopete
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kopete
@@ -5,6 +5,6 @@ Abstract: Kopete is KDE's is multi-protocol instant messenger client.
 Section: Apps/Web
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kopete/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kopete/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kopete/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kopete/*.html
 
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kpf b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kpf
index 91f5ba58f..71a6af2c2 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kpf
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kpf
@@ -5,6 +5,6 @@ Abstract: Kpf allows you to share files over a network.
 Section: Apps/Net
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kpf/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kpf/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpf/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpf/*.html
 
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kppp b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kppp
index 5b12b8945..47a8a02ee 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kppp
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kppp
@@ -6,6 +6,6 @@ Abstract: KPPP is a dialer and front end for pppd, allowing for interactive
 Section: Apps/Net
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kppp/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kppp/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kppp/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kppp/*.html
 
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.krdc b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.krdc
index 477aeadac..41f38f4db 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.krdc
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.krdc
@@ -7,6 +7,6 @@ Abstract: Krdc is a client application that allows you to view or even control
 Section: Apps/Net
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/krdc/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/krdc/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/krdc/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/krdc/*.html
 
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.krfb b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.krfb
index a19f09e05..dbfec7252 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.krfb
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.krfb
@@ -7,6 +7,6 @@ Abstract: Krfb is a server application that allows you to share your current
 Section: Apps/Net
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/krfb/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/krfb/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/krfb/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/krfb/*.html
 
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.ksirc b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.ksirc
index fda21368e..703ba7e2b 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.ksirc
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.ksirc
@@ -5,6 +5,6 @@ Abstract: KsIRC is the default KDE IRC client.
 Section: Apps/Web
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/ksirc/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/ksirc/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/ksirc/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/ksirc/*.html
 
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.ktalkd b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.ktalkd
index 52d412b7c..ea9219292 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.ktalkd
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.ktalkd
@@ -7,6 +7,6 @@ Abstract: Ktalkd is an enhanced talk daemon - a program to handle incoming
 Section: Apps/Net
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/ktalkd/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/ktalkd/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/ktalkd/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/ktalkd/*.html
 
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kwifimanager b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kwifimanager
index 5985de443..8d2ad13da 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kwifimanager
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kwifimanager
@@ -6,6 +6,6 @@ Abstract: The KWiFiMananger suite can be used to configure and monitor
 Section: Apps/Net
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kwifimanager/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kwifimanager/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kwifimanager/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kwifimanager/*.html
 
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.lisa b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.lisa
index 87459627b..aace7f520 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.lisa
+++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.lisa
@@ -6,6 +6,6 @@ Abstract: Lisa is intended to provide a kind of Network Neighborhood, but
 Section: Apps/Net
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/lisa/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/lisa/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/lisa/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/lisa/*.html
 
diff --git a/ubuntu/maverick/tdepim/debian/akregator-trinity.install b/ubuntu/maverick/tdepim/debian/akregator-trinity.install
index 2dd23adc6..456a67e27 100644
--- a/ubuntu/maverick/tdepim/debian/akregator-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/akregator-trinity.install
@@ -11,7 +11,7 @@
 /opt/trinity/share/apps/akregator
 /opt/trinity/share/config.kcfg/akregator.kcfg
 /opt/trinity/share/config.kcfg/mk4config.kcfg
-/opt/trinity/share/doc/kde/HTML/en/akregator
+/opt/trinity/share/doc/tde/HTML/en/akregator
 /opt/trinity/share/icons/hicolor/128x128/apps/akregator.png
 /opt/trinity/share/icons/crystalsvg/16x16/actions/rss_tag.png
 /opt/trinity/share/icons/crystalsvg/22x22/actions/rss_tag.png
diff --git a/ubuntu/maverick/tdepim/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdepim/debian/cdbs/debian-qt-kde.mk
index 271a018a9..fa0d532f4 100644
--- a/ubuntu/maverick/tdepim/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdepim/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/tdepim/debian/cdbs/kde.mk b/ubuntu/maverick/tdepim/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/tdepim/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdepim/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/tdepim/debian/changelog b/ubuntu/maverick/tdepim/debian/changelog
index 53b6c5851..1bcdda185 100644
--- a/ubuntu/maverick/tdepim/debian/changelog
+++ b/ubuntu/maverick/tdepim/debian/changelog
@@ -1216,7 +1216,7 @@ tdepim (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
 
 tdepim (4:3.4.0-0ubuntu10) hoary; urgency=low
 
-  * Add /usr/share/doc/kde/HTML/en/kcontrol/kalarmd/ to
+  * Add /usr/share/doc/tde/HTML/en/kcontrol/kalarmd/ to
     tdepim-doc-html to prevent dhelp error
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 30 Mar 2005 18:05:50 +0000
diff --git a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install b/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install
index cd87d91bd..ce026e81a 100644
--- a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install
@@ -18,7 +18,7 @@
 /opt/trinity/lib/libkaddressbook.so.0.0.0
 /opt/trinity/share/applications/kde/kaddressbook.desktop
 /opt/trinity/share/apps/kaddressbook
-/opt/trinity/share/doc/kde/HTML/en/kaddressbook
+/opt/trinity/share/doc/tde/HTML/en/kaddressbook
 /opt/trinity/share/icons/hicolor/128x128/apps/kaddressbook.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kaddressbook.png
 /opt/trinity/share/icons/hicolor/32x32/apps/kaddressbook.png
diff --git a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.links b/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.links
index 11e9f7bfc..8a98675cc 100644
--- a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.links
+++ b/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kaddressbook /opt/trinity/share/doc/kaddressbook/html
+/opt/trinity/share/doc/tde/HTML/en/kaddressbook /opt/trinity/share/doc/kaddressbook/html
diff --git a/ubuntu/maverick/tdepim/debian/kalarm-trinity.install b/ubuntu/maverick/tdepim/debian/kalarm-trinity.install
index 1cc168d91..a191321ec 100644
--- a/ubuntu/maverick/tdepim/debian/kalarm-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/kalarm-trinity.install
@@ -6,7 +6,7 @@
 /opt/trinity/share/apps/kalarm
 /opt/trinity/share/autostart/kalarm.tray.desktop
 /opt/trinity/share/autostart/kalarmd.autostart.desktop
-/opt/trinity/share/doc/kde/HTML/en/kalarm
+/opt/trinity/share/doc/tde/HTML/en/kalarm
 /opt/trinity/share/icons/crystalsvg/16x16/actions/kalarm.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kalarm.png
 /opt/trinity/share/icons/crystalsvg/22x22/actions/kalarm.png
diff --git a/ubuntu/maverick/tdepim/debian/kalarm-trinity.links b/ubuntu/maverick/tdepim/debian/kalarm-trinity.links
index 8753e7981..436bd4cca 100644
--- a/ubuntu/maverick/tdepim/debian/kalarm-trinity.links
+++ b/ubuntu/maverick/tdepim/debian/kalarm-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kalarm /opt/trinity/share/doc/kalarm/html
+/opt/trinity/share/doc/tde/HTML/en/kalarm /opt/trinity/share/doc/kalarm/html
diff --git a/ubuntu/maverick/tdepim/debian/kandy-trinity.install b/ubuntu/maverick/tdepim/debian/kandy-trinity.install
index 9dcd5e4d5..d42acd2ce 100644
--- a/ubuntu/maverick/tdepim/debian/kandy-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/kandy-trinity.install
@@ -4,6 +4,6 @@
 /opt/trinity/share/applnk/Utilities/kandy.desktop
 /opt/trinity/share/apps/kandy
 /opt/trinity/share/config.kcfg/kandy.kcfg
-/opt/trinity/share/doc/kde/HTML/en/kandy
+/opt/trinity/share/doc/tde/HTML/en/kandy
 ../icons/kandy.xpm /opt/trinity/share/pixmaps
 ../icons/kandy-16.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/tdepim/debian/kandy-trinity.links b/ubuntu/maverick/tdepim/debian/kandy-trinity.links
index 6f24189f2..f2d49c8a3 100644
--- a/ubuntu/maverick/tdepim/debian/kandy-trinity.links
+++ b/ubuntu/maverick/tdepim/debian/kandy-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kandy /opt/trinity/share/doc/kandy/html
+/opt/trinity/share/doc/tde/HTML/en/kandy /opt/trinity/share/doc/kandy/html
diff --git a/ubuntu/maverick/tdepim/debian/karm-trinity.install b/ubuntu/maverick/tdepim/debian/karm-trinity.install
index aab595c42..a2a22b674 100644
--- a/ubuntu/maverick/tdepim/debian/karm-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/karm-trinity.install
@@ -8,7 +8,7 @@
 /opt/trinity/share/applnk/Utilities/karm.desktop
 /opt/trinity/share/apps/karm
 /opt/trinity/share/apps/karmpart
-/opt/trinity/share/doc/kde/HTML/en/karm
+/opt/trinity/share/doc/tde/HTML/en/karm
 /opt/trinity/share/icons/hicolor/128x128/apps/karm.png
 /opt/trinity/share/icons/hicolor/16x16/apps/karm.png
 /opt/trinity/share/icons/hicolor/22x22/apps/karm.png
diff --git a/ubuntu/maverick/tdepim/debian/karm-trinity.links b/ubuntu/maverick/tdepim/debian/karm-trinity.links
index 8bc68b2d1..7ea1d2f25 100644
--- a/ubuntu/maverick/tdepim/debian/karm-trinity.links
+++ b/ubuntu/maverick/tdepim/debian/karm-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/karm /opt/trinity/share/doc/karm/html
+/opt/trinity/share/doc/tde/HTML/en/karm /opt/trinity/share/doc/karm/html
diff --git a/ubuntu/maverick/tdepim/debian/kleopatra-trinity.install b/ubuntu/maverick/tdepim/debian/kleopatra-trinity.install
index 46ad1b0e9..2e5241ad1 100644
--- a/ubuntu/maverick/tdepim/debian/kleopatra-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/kleopatra-trinity.install
@@ -5,6 +5,6 @@
 /opt/trinity/share/applications/kde/kleopatra_import.desktop
 /opt/trinity/share/apps/kleopatra
 /opt/trinity/share/apps/kwatchgnupg
-/opt/trinity/share/doc/kde/HTML/en/kleopatra
-/opt/trinity/share/doc/kde/HTML/en/kwatchgnupg
+/opt/trinity/share/doc/tde/HTML/en/kleopatra
+/opt/trinity/share/doc/tde/HTML/en/kwatchgnupg
 /opt/trinity/share/services/kleopatra_config_*.desktop
diff --git a/ubuntu/maverick/tdepim/debian/kleopatra-trinity.links b/ubuntu/maverick/tdepim/debian/kleopatra-trinity.links
index d48a8efa4..89f636dcd 100644
--- a/ubuntu/maverick/tdepim/debian/kleopatra-trinity.links
+++ b/ubuntu/maverick/tdepim/debian/kleopatra-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kleopatra /opt/trinity/share/doc/kleopatra/html/kleopatra
+/opt/trinity/share/doc/tde/HTML/en/kleopatra /opt/trinity/share/doc/kleopatra/html/kleopatra
diff --git a/ubuntu/maverick/tdepim/debian/kmail-trinity.install b/ubuntu/maverick/tdepim/debian/kmail-trinity.install
index c6a5999d2..de2821f79 100644
--- a/ubuntu/maverick/tdepim/debian/kmail-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/kmail-trinity.install
@@ -44,7 +44,7 @@
 /opt/trinity/share/config.kcfg/customtemplates_kfg.kcfg
 /opt/trinity/share/config.kcfg/replyphrases.kcfg
 /opt/trinity/share/config.kcfg/templatesconfiguration_kfg.kcfg
-/opt/trinity/share/doc/kde/HTML/en/kmail
+/opt/trinity/share/doc/tde/HTML/en/kmail
 /opt/trinity/share/icons/hicolor/128x128/apps/kmail.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kmail.png
 /opt/trinity/share/icons/hicolor/22x22/apps/kmail.png
diff --git a/ubuntu/maverick/tdepim/debian/kmail-trinity.links b/ubuntu/maverick/tdepim/debian/kmail-trinity.links
index ea0c1cc2d..21e8a877a 100644
--- a/ubuntu/maverick/tdepim/debian/kmail-trinity.links
+++ b/ubuntu/maverick/tdepim/debian/kmail-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kmail /opt/trinity/share/doc/kmail/html
+/opt/trinity/share/doc/tde/HTML/en/kmail /opt/trinity/share/doc/kmail/html
diff --git a/ubuntu/maverick/tdepim/debian/knode-trinity.install b/ubuntu/maverick/tdepim/debian/knode-trinity.install
index 5017248f9..964e43e76 100644
--- a/ubuntu/maverick/tdepim/debian/knode-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/knode-trinity.install
@@ -9,7 +9,7 @@
 /opt/trinity/lib/libknodecommon.so.3.0.0
 /opt/trinity/share/applications/kde/KNode.desktop
 /opt/trinity/share/apps/knode
-/opt/trinity/share/doc/kde/HTML/en/knode
+/opt/trinity/share/doc/tde/HTML/en/knode
 /opt/trinity/share/icons/hicolor/128x128/apps/knode.png
 /opt/trinity/share/icons/hicolor/128x128/apps/knode2.png
 /opt/trinity/share/icons/hicolor/16x16/apps/knode.png
diff --git a/ubuntu/maverick/tdepim/debian/knode-trinity.links b/ubuntu/maverick/tdepim/debian/knode-trinity.links
index 6d8007dd2..61dd05e51 100644
--- a/ubuntu/maverick/tdepim/debian/knode-trinity.links
+++ b/ubuntu/maverick/tdepim/debian/knode-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/knode /opt/trinity/share/doc/knode/html
+/opt/trinity/share/doc/tde/HTML/en/knode /opt/trinity/share/doc/knode/html
diff --git a/ubuntu/maverick/tdepim/debian/knotes-trinity.install b/ubuntu/maverick/tdepim/debian/knotes-trinity.install
index 741d0c822..602954d5d 100644
--- a/ubuntu/maverick/tdepim/debian/knotes-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/knotes-trinity.install
@@ -8,7 +8,7 @@
 /opt/trinity/share/apps/knotes
 /opt/trinity/share/config.kcfg/knoteconfig.kcfg
 /opt/trinity/share/config.kcfg/knotesglobalconfig.kcfg
-/opt/trinity/share/doc/kde/HTML/en/knotes
+/opt/trinity/share/doc/tde/HTML/en/knotes
 /opt/trinity/share/icons/hicolor/128x128/apps/knotes.png
 /opt/trinity/share/icons/hicolor/16x16/apps/knotes.png
 /opt/trinity/share/icons/hicolor/22x22/apps/knotes.png
diff --git a/ubuntu/maverick/tdepim/debian/knotes-trinity.links b/ubuntu/maverick/tdepim/debian/knotes-trinity.links
index d5e714f72..1ba2fa093 100644
--- a/ubuntu/maverick/tdepim/debian/knotes-trinity.links
+++ b/ubuntu/maverick/tdepim/debian/knotes-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/knotes /opt/trinity/share/doc/knotes/html
+/opt/trinity/share/doc/tde/HTML/en/knotes /opt/trinity/share/doc/knotes/html
diff --git a/ubuntu/maverick/tdepim/debian/konsolekalendar-trinity.install b/ubuntu/maverick/tdepim/debian/konsolekalendar-trinity.install
index f67f8b382..5f5765429 100644
--- a/ubuntu/maverick/tdepim/debian/konsolekalendar-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/konsolekalendar-trinity.install
@@ -1,8 +1,8 @@
 /opt/trinity/bin/konsolekalendar
 /opt/trinity/share/applications/kde/konsolekalendar.desktop
-/opt/trinity/share/doc/kde/HTML/en/konsolekalendar/common
-/opt/trinity/share/doc/kde/HTML/en/konsolekalendar/index.cache.bz2
-/opt/trinity/share/doc/kde/HTML/en/konsolekalendar/index.docbook
+/opt/trinity/share/doc/tde/HTML/en/konsolekalendar/common
+/opt/trinity/share/doc/tde/HTML/en/konsolekalendar/index.cache.bz2
+/opt/trinity/share/doc/tde/HTML/en/konsolekalendar/index.docbook
 /opt/trinity/share/icons/crystalsvg/16x16/apps/konsolekalendar.png
 /opt/trinity/share/icons/crystalsvg/22x22/apps/konsolekalendar.png
 /opt/trinity/share/icons/crystalsvg/32x32/apps/konsolekalendar.png
diff --git a/ubuntu/maverick/tdepim/debian/konsolekalendar-trinity.links b/ubuntu/maverick/tdepim/debian/konsolekalendar-trinity.links
index 587e4c3ca..423b5c172 100644
--- a/ubuntu/maverick/tdepim/debian/konsolekalendar-trinity.links
+++ b/ubuntu/maverick/tdepim/debian/konsolekalendar-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/konsolekalendar /opt/trinity/share/doc/konsolekalendar/html
+/opt/trinity/share/doc/tde/HTML/en/konsolekalendar /opt/trinity/share/doc/konsolekalendar/html
diff --git a/ubuntu/maverick/tdepim/debian/kontact-trinity.install b/ubuntu/maverick/tdepim/debian/kontact-trinity.install
index 93065d1f8..4c0bc653b 100644
--- a/ubuntu/maverick/tdepim/debian/kontact-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/kontact-trinity.install
@@ -22,7 +22,7 @@
 /opt/trinity/share/apps/kontact
 /opt/trinity/share/apps/kontactsummary/kontactsummary_part.rc
 /opt/trinity/share/config.kcfg/kontact.kcfg
-/opt/trinity/share/doc/kde/HTML/en/kontact
+/opt/trinity/share/doc/tde/HTML/en/kontact
 /opt/trinity/share/icons/hicolor/128x128/apps/kontact.png
 /opt/trinity/share/icons/crystalsvg/16x16/actions/kontact_*.png
 /opt/trinity/share/icons/hicolor/16x16/apps/kontact.png
diff --git a/ubuntu/maverick/tdepim/debian/kontact-trinity.links b/ubuntu/maverick/tdepim/debian/kontact-trinity.links
index f94ad41dd..9f0e2beff 100644
--- a/ubuntu/maverick/tdepim/debian/kontact-trinity.links
+++ b/ubuntu/maverick/tdepim/debian/kontact-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kontact /opt/trinity/share/doc/kontact/html
+/opt/trinity/share/doc/tde/HTML/en/kontact /opt/trinity/share/doc/kontact/html
diff --git a/ubuntu/maverick/tdepim/debian/korganizer-trinity.install b/ubuntu/maverick/tdepim/debian/korganizer-trinity.install
index 6b6ce856b..f5b60b56b 100644
--- a/ubuntu/maverick/tdepim/debian/korganizer-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/korganizer-trinity.install
@@ -23,7 +23,7 @@
 /opt/trinity/share/apps/korganizer
 /opt/trinity/share/autostart/korgac.desktop
 /opt/trinity/share/config.kcfg/korganizer.kcfg
-/opt/trinity/share/doc/kde/HTML/en/korganizer
+/opt/trinity/share/doc/tde/HTML/en/korganizer
 /opt/trinity/share/icons/hicolor/128x128/apps/korganizer.png
 /opt/trinity/share/icons/hicolor/16x16/apps/korganizer.png
 /opt/trinity/share/icons/hicolor/32x32/apps/korganizer.png
diff --git a/ubuntu/maverick/tdepim/debian/korganizer-trinity.links b/ubuntu/maverick/tdepim/debian/korganizer-trinity.links
index 37d6b1a10..608fc7441 100644
--- a/ubuntu/maverick/tdepim/debian/korganizer-trinity.links
+++ b/ubuntu/maverick/tdepim/debian/korganizer-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/korganizer /opt/trinity/share/doc/korganizer/html
+/opt/trinity/share/doc/tde/HTML/en/korganizer /opt/trinity/share/doc/korganizer/html
diff --git a/ubuntu/maverick/tdepim/debian/korn-trinity.install b/ubuntu/maverick/tdepim/debian/korn-trinity.install
index 3d1da379d..5b1c7fdaf 100644
--- a/ubuntu/maverick/tdepim/debian/korn-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/korn-trinity.install
@@ -5,7 +5,7 @@
 /opt/trinity/share/apps/kconf_update/korn-3-5-metadata-update.pl
 /opt/trinity/share/apps/kconf_update/korn-3-5-ssl-update.pl
 /opt/trinity/share/apps/kconf_update/korn-3-5-update.upd
-/opt/trinity/share/doc/kde/HTML/en/korn
+/opt/trinity/share/doc/tde/HTML/en/korn
 /opt/trinity/share/icons/hicolor/16x16/apps/korn.png
 /opt/trinity/share/icons/hicolor/32x32/apps/korn.png
 /opt/trinity/share/icons/hicolor/48x48/apps/korn.png
diff --git a/ubuntu/maverick/tdepim/debian/korn-trinity.links b/ubuntu/maverick/tdepim/debian/korn-trinity.links
index d0ca66754..915338e25 100644
--- a/ubuntu/maverick/tdepim/debian/korn-trinity.links
+++ b/ubuntu/maverick/tdepim/debian/korn-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/korn /opt/trinity/share/doc/korn/html
+/opt/trinity/share/doc/tde/HTML/en/korn /opt/trinity/share/doc/korn/html
diff --git a/ubuntu/maverick/tdepim/debian/ktnef-trinity.install b/ubuntu/maverick/tdepim/debian/ktnef-trinity.install
index 798de7961..1f299a543 100644
--- a/ubuntu/maverick/tdepim/debian/ktnef-trinity.install
+++ b/ubuntu/maverick/tdepim/debian/ktnef-trinity.install
@@ -1,7 +1,7 @@
 /opt/trinity/bin/ktnef
 /opt/trinity/share/applications/kde/ktnef.desktop
 /opt/trinity/share/apps/ktnef
-/opt/trinity/share/doc/kde/HTML/en/ktnef
+/opt/trinity/share/doc/tde/HTML/en/ktnef
 /opt/trinity/share/icons/hicolor/48x48/apps/ktnef.png
 /opt/trinity/share/icons/locolor/16x16/apps/ktnef.png
 /opt/trinity/share/icons/locolor/32x32/apps/ktnef.png
diff --git a/ubuntu/maverick/tdepim/debian/ktnef-trinity.links b/ubuntu/maverick/tdepim/debian/ktnef-trinity.links
index 2944f2814..c93eb29f5 100644
--- a/ubuntu/maverick/tdepim/debian/ktnef-trinity.links
+++ b/ubuntu/maverick/tdepim/debian/ktnef-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/ktnef /opt/trinity/share/doc/ktnef/html
+/opt/trinity/share/doc/tde/HTML/en/ktnef /opt/trinity/share/doc/ktnef/html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
index 25ac7ac38..9abd3d67b 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
@@ -5,5 +5,5 @@ Abstract: KAddressBook is the KDE address book.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kaddressbook/index.html
-Files: /usr/share/doc/kde/HTML/en/kaddressbook/*.html
+Index: /usr/share/doc/tde/HTML/en/kaddressbook/index.html
+Files: /usr/share/doc/tde/HTML/en/kaddressbook/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kalarm b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kalarm
index 2fb0a45e1..5a547ebc8 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kalarm
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kalarm
@@ -6,5 +6,5 @@ Abstract: KAlarm is a personal alarm message, command and email
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kalarm/index.html
-Files: /usr/share/doc/kde/HTML/en/kalarm/*.html
+Index: /usr/share/doc/tde/HTML/en/kalarm/index.html
+Files: /usr/share/doc/tde/HTML/en/kalarm/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kandy b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kandy
index ec6ed3f59..a947b70a0 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kandy
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kandy
@@ -6,5 +6,5 @@ Abstract: Kandy is an application for synchronizing the data on a mobile
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kandy/index.html
-Files: /usr/share/doc/kde/HTML/en/kandy/*.html
+Index: /usr/share/doc/tde/HTML/en/kandy/index.html
+Files: /usr/share/doc/tde/HTML/en/kandy/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.karm b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.karm
index 33b26cac8..40811c94b 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.karm
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.karm
@@ -5,5 +5,5 @@ Abstract: KArm tracks time spent on various tasks.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/karm/index.html
-Files: /usr/share/doc/kde/HTML/en/karm/*.html
+Index: /usr/share/doc/tde/HTML/en/karm/index.html
+Files: /usr/share/doc/tde/HTML/en/karm/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kleopatra b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
index d4c59f7a5..59f829e56 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
@@ -5,5 +5,5 @@ Abstract: Kleopatra is a tool for managing X.509 certificates.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kleopatra/index.html
-Files: /usr/share/doc/kde/HTML/en/kleopatra/*.html
+Index: /usr/share/doc/tde/HTML/en/kleopatra/index.html
+Files: /usr/share/doc/tde/HTML/en/kleopatra/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kmail b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kmail
index b76d30f6b..2c4405d79 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kmail
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kmail
@@ -5,5 +5,5 @@ Abstract: KMail is KDE's powerful and user friendly email client.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kmail/index.html
-Files: /usr/share/doc/kde/HTML/en/kmail/*.html
+Index: /usr/share/doc/tde/HTML/en/kmail/index.html
+Files: /usr/share/doc/tde/HTML/en/kmail/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knode b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knode
index 74ddd8031..675dbdb2f 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knode
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knode
@@ -5,5 +5,5 @@ Abstract: KNode is an easy-to-use newsreader.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/knode/index.html
-Files: /usr/share/doc/kde/HTML/en/knode/*.html
+Index: /usr/share/doc/tde/HTML/en/knode/index.html
+Files: /usr/share/doc/tde/HTML/en/knode/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knotes b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knotes
index 88cd4e75f..1292db38f 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knotes
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knotes
@@ -5,5 +5,5 @@ Abstract: KNotes is a sticky notes application for the desktop.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/knotes/index.html
-Files: /usr/share/doc/kde/HTML/en/knotes/*.html
+Index: /usr/share/doc/tde/HTML/en/knotes/index.html
+Files: /usr/share/doc/tde/HTML/en/knotes/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
index 52fdd1a6b..e9a0e6459 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
@@ -5,5 +5,5 @@ Abstract: KonsoleKalendar is a command line interface to KDE calendars.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/konsolekalendar/index.html
-Files: /usr/share/doc/kde/HTML/en/konsolekalendar/*.html
+Index: /usr/share/doc/tde/HTML/en/konsolekalendar/index.html
+Files: /usr/share/doc/tde/HTML/en/konsolekalendar/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kontact b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kontact
index cfc6d4e0f..52e2946ff 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kontact
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kontact
@@ -5,5 +5,5 @@ Abstract: Kontact is a command line interface to KDE calendars.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kontact/index.html
-Files: /usr/share/doc/kde/HTML/en/kontact/*.html
+Index: /usr/share/doc/tde/HTML/en/kontact/index.html
+Files: /usr/share/doc/tde/HTML/en/kontact/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korganizer b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korganizer
index ac05fc107..96f8aae6a 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korganizer
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korganizer
@@ -5,5 +5,5 @@ Abstract: KOrganizer is an easy to use personal information manager.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/korganizer/index.html
-Files: /usr/share/doc/kde/HTML/en/korganizer/*.html
+Index: /usr/share/doc/tde/HTML/en/korganizer/index.html
+Files: /usr/share/doc/tde/HTML/en/korganizer/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korn b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korn
index 4d9e3ce8b..5d731fded 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korn
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korn
@@ -5,5 +5,5 @@ Abstract: KOrn is a mail monitor.
 Section: Apps/Net
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/korn/index.html
-Files: /usr/share/doc/kde/HTML/en/korn/*.html
+Index: /usr/share/doc/tde/HTML/en/korn/index.html
+Files: /usr/share/doc/tde/HTML/en/korn/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kpilot b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kpilot
index d30a8cdf8..b724ef964 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kpilot
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kpilot
@@ -6,5 +6,5 @@ Abstract: KPilot is the KDE version of the Desktop HotSync software for
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kpilot/index.html
-Files: /usr/share/doc/kde/HTML/en/kpilot/*.html
+Index: /usr/share/doc/tde/HTML/en/kpilot/index.html
+Files: /usr/share/doc/tde/HTML/en/kpilot/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.ktnef b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.ktnef
index 38a420e1f..ad5a72fb6 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.ktnef
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.ktnef
@@ -5,5 +5,5 @@ Abstract: The TNEF File Viewer is an application for TNEF mail attachments.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/ktnef/index.html
-Files: /usr/share/doc/kde/HTML/en/ktnef/*.html
+Index: /usr/share/doc/tde/HTML/en/ktnef/index.html
+Files: /usr/share/doc/tde/HTML/en/ktnef/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
index 8e268e8f0..720eb2a89 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
@@ -5,5 +5,5 @@ Abstract: KWatchGnuPG is a simple GnuPG log viewer.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kwatchgnupg/index.html
-Files: /usr/share/doc/kde/HTML/en/kwatchgnupg/*.html
+Index: /usr/share/doc/tde/HTML/en/kwatchgnupg/index.html
+Files: /usr/share/doc/tde/HTML/en/kwatchgnupg/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.multisynk b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.multisynk
index 255dcb112..41f0d96d0 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.multisynk
+++ b/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.multisynk
@@ -5,5 +5,5 @@ Abstract: KDE synchronization application.
 Section: Apps/Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/multisynk/index.html
-Files: /usr/share/doc/kde/HTML/en/multisynk/*.html
+Index: /usr/share/doc/tde/HTML/en/multisynk/index.html
+Files: /usr/share/doc/tde/HTML/en/multisynk/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-trinity-doc.doc-base b/ubuntu/maverick/tdepim/debian/tdepim-trinity-doc.doc-base
index b57d47ef7..ee8a36ced 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-trinity-doc.doc-base
+++ b/ubuntu/maverick/tdepim/debian/tdepim-trinity-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: This is the developers' API documentation for tdepim.
 Section: Apps/Programming
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/tdepim-apidocs/index.html
-Files: /usr/share/doc/kde/HTML/en/tdepim-apidocs/*.html
+Index: /usr/share/doc/tde/HTML/en/tdepim-apidocs/index.html
+Files: /usr/share/doc/tde/HTML/en/tdepim-apidocs/*.html
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-trinity-doc.install b/ubuntu/maverick/tdepim/debian/tdepim-trinity-doc.install
index a747d872b..3454b260b 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-trinity-doc.install
+++ b/ubuntu/maverick/tdepim/debian/tdepim-trinity-doc.install
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/tdepim-apidocs/*
+/opt/trinity/share/doc/tde/HTML/en/tdepim-apidocs/*
diff --git a/ubuntu/maverick/tdesdk/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdesdk/debian/cdbs/debian-qt-kde.mk
index cae625265..d135c4257 100644
--- a/ubuntu/maverick/tdesdk/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdesdk/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk b/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.install b/ubuntu/maverick/tdesdk/debian/cervisia-trinity.install
index b4087e1c1..f696f658f 100644
--- a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/cervisia-trinity.install
@@ -15,10 +15,10 @@ debian/tmp/opt/trinity/share/apps/kconf_update/cervisia-normalize_cvsroot.pl
 debian/tmp/opt/trinity/share/apps/kconf_update/move_repositories.pl
 debian/tmp/opt/trinity/share/apps/kconf_update/change_colors.pl
 debian/tmp/opt/trinity/share/config.kcfg/cervisiapart.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/cervisia/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/cervisia/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/cervisia/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/cervisia/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/cervisia/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/cervisia/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/cervisia/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/cervisia/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/cervisia.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/cervisia.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/cervisia.png
diff --git a/ubuntu/maverick/tdesdk/debian/control b/ubuntu/maverick/tdesdk/debian/control
index 76302c587..2e8870c58 100644
--- a/ubuntu/maverick/tdesdk/debian/control
+++ b/ubuntu/maverick/tdesdk/debian/control
@@ -40,8 +40,8 @@ Description: Trinity Software Development Kit documentation in HTML format
  HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /usr/share/doc/kde/HTML/<language>/<app>/, for instance
- /usr/share/doc/kde/HTML/en/umbrello/. Documentation is provided for most
+ /usr/share/doc/tde/HTML/<language>/<app>/, for instance
+ /usr/share/doc/tde/HTML/en/umbrello/. Documentation is provided for most
  KDE SDK packages.
  .
  This package is part of Trinity, and a component of the KDE SDK module.
diff --git a/ubuntu/maverick/tdesdk/debian/control.in b/ubuntu/maverick/tdesdk/debian/control.in
index 2e5b5c1ad..90ce40820 100644
--- a/ubuntu/maverick/tdesdk/debian/control.in
+++ b/ubuntu/maverick/tdesdk/debian/control.in
@@ -36,8 +36,8 @@ Description: KDE Software Development Kit documentation in HTML format
  HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /usr/share/doc/kde/HTML/<language>/<app>/, for instance
- /usr/share/doc/kde/HTML/en/umbrello/. Documentation is provided for most
+ /usr/share/doc/tde/HTML/<language>/<app>/, for instance
+ /usr/share/doc/tde/HTML/en/umbrello/. Documentation is provided for most
  KDE SDK packages.
  .
  This package is part of KDE, and a component of the KDE SDK module.
diff --git a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.install b/ubuntu/maverick/tdesdk/debian/kbabel-trinity.install
index 40e614c64..89437643b 100644
--- a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/kbabel-trinity.install
@@ -66,11 +66,11 @@ debian/tmp/opt/trinity/share/apps/kconf_update/kbabel-project.upd
 debian/tmp/opt/trinity/share/apps/kconf_update/kbabel-projectrename.upd
 debian/tmp/opt/trinity/share/config.kcfg/kbabel.kcfg
 debian/tmp/opt/trinity/share/config.kcfg/kbprojectsettings.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kbabel/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kbabel/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kbabel/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kbabel/*.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kbabel/TODO
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/TODO
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/catalogmanager.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kbabel.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kbabeldict.png
diff --git a/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.install b/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.install
index 98cb1832e..80072a35e 100644
--- a/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.install
@@ -7,9 +7,9 @@ debian/tmp/opt/trinity/share/apps/kbugbuster/pics/bars.png
 debian/tmp/opt/trinity/share/apps/kbugbuster/pics/logo.png
 debian/tmp/opt/trinity/share/apps/kbugbuster/pics/tools.png
 debian/tmp/opt/trinity/share/apps/kbugbuster/pics/top-right.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kbugbuster/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kbugbuster/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kbugbuster/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbugbuster/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbugbuster/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbugbuster/*.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kbugbuster.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kbugbuster.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kbugbuster.png
diff --git a/ubuntu/maverick/tdesdk/debian/kompare-trinity.install b/ubuntu/maverick/tdesdk/debian/kompare-trinity.install
index e4050e27f..111ebeea1 100644
--- a/ubuntu/maverick/tdesdk/debian/kompare-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/kompare-trinity.install
@@ -10,15 +10,15 @@ debian/tmp/opt/trinity/lib/trinity/libkomparepart.so
 debian/tmp/opt/trinity/share/applications/kde/kompare.desktop
 debian/tmp/opt/trinity/share/apps/kompare/komparepartui.rc
 debian/tmp/opt/trinity/share/apps/kompare/kompareui.rc
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompare/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompare/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompare/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompare/settings-view1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompare/settings-diff4.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompare/settings-diff3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompare/settings-diff1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompare/settings-view2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompare/settings-diff2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kompare/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kompare/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kompare/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kompare/settings-view1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kompare/settings-diff4.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kompare/settings-diff3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kompare/settings-diff1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kompare/settings-view2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kompare/settings-diff2.png
 debian/tmp/opt/trinity/share/services/komparenavtreepart.desktop
 debian/tmp/opt/trinity/share/services/komparepart.desktop
 debian/tmp/opt/trinity/share/servicetypes/komparenavigationpart.desktop
diff --git a/ubuntu/maverick/tdesdk/debian/man/catalogmanager.1 b/ubuntu/maverick/tdesdk/debian/man/catalogmanager.1
index 943f2c4d5..bf439f0e4 100644
--- a/ubuntu/maverick/tdesdk/debian/man/catalogmanager.1
+++ b/ubuntu/maverick/tdesdk/debian/man/catalogmanager.1
@@ -53,7 +53,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kbabel/\fP.
+\fI/usr/share/doc/tde/HTML/en/kbabel/\fP.
 .SH AUTHOR
 KBabel was written by Matthias Kiefer <kiefer@kde.org>,
 Wolfram Diestel <wolfram@steloj.de>, Andrea Rizzi <rizzi@kde.org>,
diff --git a/ubuntu/maverick/tdesdk/debian/man/kbabel.1 b/ubuntu/maverick/tdesdk/debian/man/kbabel.1
index a54fbea55..822d01f5f 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kbabel.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kbabel.1
@@ -61,7 +61,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kbabel/\fP.
+\fI/usr/share/doc/tde/HTML/en/kbabel/\fP.
 .SH AUTHOR
 KBabel was written by Matthias Kiefer <kiefer@kde.org>,
 Wolfram Diestel <wolfram@steloj.de>, Andrea Rizzi <rizzi@kde.org>,
diff --git a/ubuntu/maverick/tdesdk/debian/man/kbabeldict.1 b/ubuntu/maverick/tdesdk/debian/man/kbabeldict.1
index 7fbfff0d2..0e6c11d81 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kbabeldict.1
+++ b/ubuntu/maverick/tdesdk/debian/man/kbabeldict.1
@@ -53,7 +53,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kbabel/\fP.
+\fI/usr/share/doc/tde/HTML/en/kbabel/\fP.
 .SH AUTHOR
 KBabel was written by Matthias Kiefer <kiefer@kde.org>,
 Wolfram Diestel <wolfram@steloj.de>, Andrea Rizzi <rizzi@kde.org>,
diff --git a/ubuntu/maverick/tdesdk/debian/man/tdecachegrind.1 b/ubuntu/maverick/tdesdk/debian/man/tdecachegrind.1
index 6e4d92a15..eebce39cc 100644
--- a/ubuntu/maverick/tdesdk/debian/man/tdecachegrind.1
+++ b/ubuntu/maverick/tdesdk/debian/man/tdecachegrind.1
@@ -59,7 +59,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/tdecachegrind/\fP.
+\fI/usr/share/doc/tde/HTML/en/tdecachegrind/\fP.
 .SH AUTHOR
 KCachegrind was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
 .br
diff --git a/ubuntu/maverick/tdesdk/debian/man/umbrello.1 b/ubuntu/maverick/tdesdk/debian/man/umbrello.1
index 9034cabea..338486063 100644
--- a/ubuntu/maverick/tdesdk/debian/man/umbrello.1
+++ b/ubuntu/maverick/tdesdk/debian/man/umbrello.1
@@ -44,7 +44,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/umbrello/\fP.
+\fI/usr/share/doc/tde/HTML/en/umbrello/\fP.
 .SH AUTHOR
 Umbrello was written by Paul Hensgen <phensgen@users.sourceforge.net> and
 many others.
diff --git a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.install b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.install
index 4bad0216b..2d83cc215 100644
--- a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.install
@@ -8,9 +8,9 @@ debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/22x22/actions/perc
 debian/tmp/opt/trinity/share/apps/tdecachegrind/icons/hicolor/32x32/actions/percent.png
 debian/tmp/opt/trinity/share/apps/tdecachegrind/tdecachegrindui.rc
 debian/tmp/opt/trinity/share/apps/tdecachegrind/tips
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdecachegrind/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdecachegrind/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdecachegrind/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdecachegrind/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdecachegrind/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdecachegrind/*.docbook
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/tdecachegrind.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/tdecachegrind.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdecachegrind.png
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.cervisia b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.cervisia
index bc24f7dc3..f9caebf8e 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.cervisia
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.cervisia
@@ -5,6 +5,6 @@ Abstract: Cervisia provides a graphical view of CVS.
 Section: Apps/Programming
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/cervisia/index.html
-Files: /usr/share/doc/kde/HTML/en/cervisia/*.html
+Index: /usr/share/doc/tde/HTML/en/cervisia/index.html
+Files: /usr/share/doc/tde/HTML/en/cervisia/*.html
 
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.kbabel b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.kbabel
index c02ae546a..1b1c8620e 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.kbabel
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.kbabel
@@ -8,6 +8,6 @@ Abstract: KBabel is a suite of an advanced and easy to use PO-file
 Section: Apps/Programming
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kbabel/index.html
-Files: /usr/share/doc/kde/HTML/en/kbabel/*.html
+Index: /usr/share/doc/tde/HTML/en/kbabel/index.html
+Files: /usr/share/doc/tde/HTML/en/kbabel/*.html
 
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind
index fca2157d6..d2e14e34f 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind
@@ -6,6 +6,6 @@ Abstract: KCachegrind is a profile data visualization tool, written
 Section: Apps/Programming
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/tdecachegrind/index.html
-Files: /usr/share/doc/kde/HTML/en/tdecachegrind/*.html
+Index: /usr/share/doc/tde/HTML/en/tdecachegrind/index.html
+Files: /usr/share/doc/tde/HTML/en/tdecachegrind/*.html
 
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.umbrello b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.umbrello
index 2d10a317c..d32efe53f 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.umbrello
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.umbrello
@@ -7,6 +7,6 @@ Abstract: Umbrello UML Modeller helps the software development process
 Section: Apps/Programming
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/umbrello/index.html
-Files: /usr/share/doc/kde/HTML/en/umbrello/*.html
+Index: /usr/share/doc/tde/HTML/en/umbrello/index.html
+Files: /usr/share/doc/tde/HTML/en/umbrello/*.html
 
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.install b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.install
index 8b7f3c79f..b1549b179 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.install
@@ -56,9 +56,9 @@ debian/tmp/opt/trinity/share/man/man1/kde-build.1
 debian/tmp/opt/trinity/share/man/man1/includemocs.1
 debian/tmp/opt/trinity/share/man/man1/noncvslist.1
 debian/tmp/opt/trinity/share/man/man1/tdesvn-build.1
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesvn-build/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesvn-build/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdesvn-build/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesvn-build/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesvn-build/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesvn-build/index.docbook
 scripts/kde-devel-gdb /opt/trinity/share/tdesdk-scripts
 scripts/kde-devel-vim.vim /opt/trinity/share/tdesdk-scripts
 scripts/kde-emacs/*.el /opt/trinity/share/emacs/site-lisp/tdesdk-scripts
diff --git a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.install b/ubuntu/maverick/tdesdk/debian/umbrello-trinity.install
index 3e823f767..2ddf21a77 100644
--- a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/umbrello-trinity.install
@@ -24,10 +24,10 @@ debian/tmp/opt/trinity/share/apps/umbrello/xmi.css
 debian/tmp/opt/trinity/share/apps/umbrello/xmi2docbook.xsl
 debian/tmp/opt/trinity/share/apps/umbrello/docbook2xhtml.xsl
 debian/tmp/opt/trinity/share/apps/umbrello/common.ent
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/umbrello/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/umbrello/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/umbrello/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/umbrello/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/umbrello/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/umbrello/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/umbrello/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/umbrello/*.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/umbrello_*.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/umbrello.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/umbrellofile.png
diff --git a/ubuntu/maverick/tdetoys/debian/amor-trinity.install b/ubuntu/maverick/tdetoys/debian/amor-trinity.install
index 56a51c1b0..861ad858c 100644
--- a/ubuntu/maverick/tdetoys/debian/amor-trinity.install
+++ b/ubuntu/maverick/tdetoys/debian/amor-trinity.install
@@ -2,10 +2,10 @@ debian/tmp/opt/trinity/bin/amor
 debian/tmp/opt/trinity/include/tde/AmorIface.h
 debian/tmp/opt/trinity/share/apps/amor
 debian/tmp/opt/trinity/share/applications/kde/amor.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/amor/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/amor/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/amor/*.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/amor/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/amor/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/amor/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/amor/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/amor/common
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/amor.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/amor.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/amor.png
diff --git a/ubuntu/maverick/tdetoys/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdetoys/debian/cdbs/debian-qt-kde.mk
index cae625265..d135c4257 100644
--- a/ubuntu/maverick/tdetoys/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdetoys/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/tdetoys/debian/cdbs/kde.mk b/ubuntu/maverick/tdetoys/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/tdetoys/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdetoys/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/tdetoys/debian/control b/ubuntu/maverick/tdetoys/debian/control
index 7388f1dbd..59533cbfb 100644
--- a/ubuntu/maverick/tdetoys/debian/control
+++ b/ubuntu/maverick/tdetoys/debian/control
@@ -36,8 +36,8 @@ Description: Trinity toys documentation in HTML format
  HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /opt/trinity/share/doc/kde/HTML/<language>/<app>/, for instance
- /opt/trinity/share/doc/kde/HTML/en/amor/. Documentation is provided for most
+ /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
+ /opt/trinity/share/doc/tde/HTML/en/amor/. Documentation is provided for most
  KDE toys packages.
  .
  This package is part of Trinity, and a component of the KDE toys module.
diff --git a/ubuntu/maverick/tdetoys/debian/control.in b/ubuntu/maverick/tdetoys/debian/control.in
index df8f74d5d..3825622d3 100644
--- a/ubuntu/maverick/tdetoys/debian/control.in
+++ b/ubuntu/maverick/tdetoys/debian/control.in
@@ -33,8 +33,8 @@ Description: KDE toys documentation in HTML format
  HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /opt/trinity/share/doc/kde/HTML/<language>/<app>/, for instance
- /opt/trinity/share/doc/kde/HTML/en/amor/. Documentation is provided for most
+ /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
+ /opt/trinity/share/doc/tde/HTML/en/amor/. Documentation is provided for most
  KDE toys packages.
  .
  This package is part of KDE, and a component of the KDE toys module.
diff --git a/ubuntu/maverick/tdetoys/debian/kmoon-trinity.install b/ubuntu/maverick/tdetoys/debian/kmoon-trinity.install
index 0fa153323..d8af4fa2f 100644
--- a/ubuntu/maverick/tdetoys/debian/kmoon-trinity.install
+++ b/ubuntu/maverick/tdetoys/debian/kmoon-trinity.install
@@ -2,10 +2,10 @@ debian/tmp/opt/trinity/lib/trinity/kmoon_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/kmoon_panelapplet.so
 debian/tmp/opt/trinity/share/apps/kicker/applets/kmoonapplet.desktop
 debian/tmp/opt/trinity/share/apps/kmoon
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmoon/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmoon/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmoon/carlosmail
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kmoon/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmoon/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmoon/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmoon/carlosmail
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmoon/common
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmoon.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmoon.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kmoon.png
diff --git a/ubuntu/maverick/tdetoys/debian/kodo-trinity.install b/ubuntu/maverick/tdetoys/debian/kodo-trinity.install
index b839e41a4..e3563ae4c 100644
--- a/ubuntu/maverick/tdetoys/debian/kodo-trinity.install
+++ b/ubuntu/maverick/tdetoys/debian/kodo-trinity.install
@@ -1,10 +1,10 @@
 debian/tmp/opt/trinity/bin/kodo
 debian/tmp/opt/trinity/share/applications/kde/kodo.desktop
 debian/tmp/opt/trinity/share/apps/kodo/numbers.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kodo/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kodo/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kodo/*.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kodo/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kodo/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kodo/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kodo/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kodo/common
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kodo.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kodo.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kodo.png
diff --git a/ubuntu/maverick/tdetoys/debian/kteatime-trinity.install b/ubuntu/maverick/tdetoys/debian/kteatime-trinity.install
index c8c574b0b..dcf1742c4 100644
--- a/ubuntu/maverick/tdetoys/debian/kteatime-trinity.install
+++ b/ubuntu/maverick/tdetoys/debian/kteatime-trinity.install
@@ -1,10 +1,10 @@
 debian/tmp/opt/trinity/bin/kteatime
 debian/tmp/opt/trinity/share/applications/kde/kteatime.desktop
 debian/tmp/opt/trinity/share/apps/kteatime
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kteatime/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kteatime/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kteatime/*.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kteatime/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kteatime/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kteatime/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kteatime/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kteatime/common
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kteatime.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kteatime.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kteatime.png
diff --git a/ubuntu/maverick/tdetoys/debian/kweather-trinity.install b/ubuntu/maverick/tdetoys/debian/kweather-trinity.install
index ef03fcd89..a74d2c148 100644
--- a/ubuntu/maverick/tdetoys/debian/kweather-trinity.install
+++ b/ubuntu/maverick/tdetoys/debian/kweather-trinity.install
@@ -14,9 +14,9 @@ debian/tmp/opt/trinity/share/apps/kicker/applets/kweather.desktop
 debian/tmp/opt/trinity/share/apps/kweather
 debian/tmp/opt/trinity/share/apps/kweatherservice/stations.dat
 debian/tmp/opt/trinity/share/apps/kweatherservice/weather_stations.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kweather/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kweather/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kweather/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kweather/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kweather/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kweather/common
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kweather.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kweather.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kweather.png
diff --git a/ubuntu/maverick/tdetoys/debian/kworldclock-trinity.install b/ubuntu/maverick/tdetoys/debian/kworldclock-trinity.install
index 160b8b1dd..ba9a38321 100644
--- a/ubuntu/maverick/tdetoys/debian/kworldclock-trinity.install
+++ b/ubuntu/maverick/tdetoys/debian/kworldclock-trinity.install
@@ -5,10 +5,10 @@ debian/tmp/opt/trinity/share/applications/kde/kworldclock.desktop
 debian/tmp/opt/trinity/share/apps/kdesktop/programs/kdeworld.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/kwwapplet.desktop
 debian/tmp/opt/trinity/share/apps/kworldclock
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kworldclock/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kworldclock/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kworldclock/*.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kworldclock/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kworldclock/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kworldclock/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kworldclock/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kworldclock/common
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kworldclock.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kworldclock.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kworldclock.png
diff --git a/ubuntu/maverick/tdetoys/debian/man/amor-trinity.1 b/ubuntu/maverick/tdetoys/debian/man/amor-trinity.1
index 9fec8d958..66dc790e4 100644
--- a/ubuntu/maverick/tdetoys/debian/man/amor-trinity.1
+++ b/ubuntu/maverick/tdetoys/debian/man/amor-trinity.1
@@ -41,7 +41,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdetoys-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/amor/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/amor/\fP.
 .SH AUTHOR
 AMOR was written by Martin R. Jones <mjones@kde.org> and
 Gerardo Puga <gpuga@gioia.ing.unlp.edu.ar>.
diff --git a/ubuntu/maverick/tdetoys/debian/man/kodo-trinity.1 b/ubuntu/maverick/tdetoys/debian/man/kodo-trinity.1
index 9efd2f8f8..eba9c14e2 100644
--- a/ubuntu/maverick/tdetoys/debian/man/kodo-trinity.1
+++ b/ubuntu/maverick/tdetoys/debian/man/kodo-trinity.1
@@ -39,7 +39,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdetoys-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kodo/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kodo/\fP.
 .SH AUTHOR
 KOdometer was written by Armen Nakashian <armen@tourismo.com> and
 Mark H. Granoff/mhg <granoff@keptin.lkg.dec.com>.
diff --git a/ubuntu/maverick/tdetoys/debian/man/kteatime-trinity.1 b/ubuntu/maverick/tdetoys/debian/man/kteatime-trinity.1
index a9f4478eb..5b6e37965 100644
--- a/ubuntu/maverick/tdetoys/debian/man/kteatime-trinity.1
+++ b/ubuntu/maverick/tdetoys/debian/man/kteatime-trinity.1
@@ -40,7 +40,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdetoys-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kteatime/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kteatime/\fP.
 .SH AUTHOR
 KTeaTime was written by Matthias Hoelzer-Kluepfel <hoelzer@kde.org> and
 Martin Willers <willers@xm-arts.de>.
diff --git a/ubuntu/maverick/tdetoys/debian/man/kweatherreport-trinity.1 b/ubuntu/maverick/tdetoys/debian/man/kweatherreport-trinity.1
index d2add1667..e607a59c0 100644
--- a/ubuntu/maverick/tdetoys/debian/man/kweatherreport-trinity.1
+++ b/ubuntu/maverick/tdetoys/debian/man/kweatherreport-trinity.1
@@ -47,7 +47,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdetoys-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kweather/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kweather/\fP.
 .SH AUTHOR
 KWeather was written by Ian Reinhart Geiser <geiseri@kde.org>,
 Nadeem Hasan <nhasan@kde.org> and Tobias Koenig <tokoe@kde.org>.
diff --git a/ubuntu/maverick/tdetoys/debian/man/kweatherservice-trinity.1 b/ubuntu/maverick/tdetoys/debian/man/kweatherservice-trinity.1
index 39fd549b9..59c3ef33a 100644
--- a/ubuntu/maverick/tdetoys/debian/man/kweatherservice-trinity.1
+++ b/ubuntu/maverick/tdetoys/debian/man/kweatherservice-trinity.1
@@ -44,7 +44,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdetoys-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kweather/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kweather/\fP.
 .SH AUTHOR
 KWeather was written by Ian Reinhart Geiser <geiseri@kde.org>,
 Nadeem Hasan <nhasan@kde.org> and Tobias Koenig <tokoe@kde.org>.
diff --git a/ubuntu/maverick/tdetoys/debian/man/kworldclock-trinity.1 b/ubuntu/maverick/tdetoys/debian/man/kworldclock-trinity.1
index f383c5b86..4cea81146 100644
--- a/ubuntu/maverick/tdetoys/debian/man/kworldclock-trinity.1
+++ b/ubuntu/maverick/tdetoys/debian/man/kworldclock-trinity.1
@@ -61,7 +61,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdetoys-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kworldclock/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kworldclock/\fP.
 .SH AUTHOR
 KWorldClock was written by Matthias Hoelzer-Kluepfel <hoelzer@kde.org>
 and others.
diff --git a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.amor b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.amor
index f8f0260a3..b6bdc1069 100644
--- a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.amor
+++ b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.amor
@@ -5,6 +5,6 @@ Abstract: AMOR is a small animation which sits on top of your active window.
 Section: Games/Toys
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/amor/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/amor/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/amor/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/amor/*.html
 
diff --git a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kmoon b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kmoon
index 8dd4b68cd..0ed6e279f 100644
--- a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kmoon
+++ b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kmoon
@@ -5,6 +5,6 @@ Abstract: KMoon is an applet that shows the current phase of the moon.
 Section: Games/Toys
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kmoon/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kmoon/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kmoon/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kmoon/*.html
 
diff --git a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kodo b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kodo
index 6fcc75e2b..9393d7ba4 100644
--- a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kodo
+++ b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kodo
@@ -5,6 +5,6 @@ Abstract: KOdometer is a little gadget to measure your desktop mileage.
 Section: Games/Toys
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kodo/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kodo/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kodo/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kodo/*.html
 
diff --git a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kteatime b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kteatime
index 1425d8d02..0b3e3f7bf 100644
--- a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kteatime
+++ b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kteatime
@@ -5,6 +5,6 @@ Abstract: This Handbook describes KTeaTime, the KDE Tea Cooker.
 Section: Games/Toys
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kteatime/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kteatime/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kteatime/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kteatime/*.html
 
diff --git a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kweather b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kweather
index 82a9ab993..110d5f8ac 100644
--- a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kweather
+++ b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kweather
@@ -6,6 +6,6 @@ Abstract: KWeather is an application that can display your area's current
 Section: Games/Toys
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kweather/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kweather/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kweather/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kweather/*.html
 
diff --git a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kworldclock b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kworldclock
index a2a57f683..d73c2a411 100644
--- a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kworldclock
+++ b/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kworldclock
@@ -7,6 +7,6 @@ Abstract: KWorldClock is an application that shows which parts of the world
 Section: Games/Toys
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kworldclock/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kworldclock/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kworldclock/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kworldclock/*.html
 
diff --git a/ubuntu/maverick/tdeutils/debian/ark-trinity.install b/ubuntu/maverick/tdeutils/debian/ark-trinity.install
index fd8123f1a..f0fd5ac60 100644
--- a/ubuntu/maverick/tdeutils/debian/ark-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/ark-trinity.install
@@ -20,10 +20,10 @@ debian/tmp/opt/trinity/share/apps/ark/icons/crystalsvg/32x32/actions/ark_delete.
 debian/tmp/opt/trinity/share/apps/ark/icons/crystalsvg/32x32/actions/ark_extract.png
 debian/tmp/opt/trinity/share/apps/ark/icons/crystalsvg/32x32/actions/ark_view.png
 debian/tmp/opt/trinity/share/config.kcfg/ark.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ark/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ark/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ark/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ark/man-ark.1.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ark/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ark/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ark/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ark/man-ark.1.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/ark.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/ark.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/ark.png
diff --git a/ubuntu/maverick/tdeutils/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdeutils/debian/cdbs/debian-qt-kde.mk
index cae625265..d135c4257 100644
--- a/ubuntu/maverick/tdeutils/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdeutils/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/tdeutils/debian/cdbs/kde.mk b/ubuntu/maverick/tdeutils/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/tdeutils/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdeutils/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/tdeutils/debian/control b/ubuntu/maverick/tdeutils/debian/control
index 2c965d3c9..5700bcccb 100644
--- a/ubuntu/maverick/tdeutils/debian/control
+++ b/ubuntu/maverick/tdeutils/debian/control
@@ -49,8 +49,8 @@ Description: Trinity utilities documentation in HTML format
  converted to HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /usr/share/doc/kde/HTML/<language>/<app>/, for instance
- /usr/share/doc/kde/HTML/en/ark/. Documentation is provided for most
+ /usr/share/doc/tde/HTML/<language>/<app>/, for instance
+ /usr/share/doc/tde/HTML/en/ark/. Documentation is provided for most
  KDE utilities packages.
  .
  This package is part of Trinity, as a component of the KDE utilities module.
diff --git a/ubuntu/maverick/tdeutils/debian/control.in b/ubuntu/maverick/tdeutils/debian/control.in
index 7c4c2b3cc..eb2e16643 100644
--- a/ubuntu/maverick/tdeutils/debian/control.in
+++ b/ubuntu/maverick/tdeutils/debian/control.in
@@ -43,8 +43,8 @@ Description: KDE utilities documentation in HTML format
  converted to HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /usr/share/doc/kde/HTML/<language>/<app>/, for instance
- /usr/share/doc/kde/HTML/en/ark/. Documentation is provided for most
+ /usr/share/doc/tde/HTML/<language>/<app>/, for instance
+ /usr/share/doc/tde/HTML/en/ark/. Documentation is provided for most
  KDE utilities packages.
  .
  This package is part of KDE, as a component of the KDE utilities module.
diff --git a/ubuntu/maverick/tdeutils/debian/kcalc-trinity.install b/ubuntu/maverick/tdeutils/debian/kcalc-trinity.install
index b4806f5f0..0c0e03d96 100644
--- a/ubuntu/maverick/tdeutils/debian/kcalc-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/kcalc-trinity.install
@@ -6,12 +6,12 @@ debian/tmp/opt/trinity/share/applications/kde/kcalc.desktop
 debian/tmp/opt/trinity/share/apps/kcalc/kcalcui.rc
 debian/tmp/opt/trinity/share/apps/kconf_update/kcalcrc.upd
 debian/tmp/opt/trinity/share/config.kcfg/kcalc.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcalc/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcalc/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcalc/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcalc/commands.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcalc/kcalc_on_Aix.txt
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcalc/kcalc_on_OSF.txt
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/commands.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/kcalc_on_Aix.txt
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/kcalc_on_OSF.txt
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kcalc.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kcalc.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kcalc.png
diff --git a/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.install b/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.install
index d2987fae5..a18296be0 100644
--- a/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.install
@@ -5,9 +5,9 @@ debian/tmp/opt/trinity/share/applications/kde/KCharSelect.desktop
 debian/tmp/opt/trinity/share/apps/kcharselect/kcharselectui.rc
 debian/tmp/opt/trinity/share/apps/kconf_update/kcharselect.upd
 debian/tmp/opt/trinity/share/apps/kicker/applets/kcharselectapplet.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcharselect/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcharselect/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcharselect/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcharselect/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcharselect/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcharselect/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kcharselect.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kcharselect.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kcharselect.png
diff --git a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install b/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install
index cf0ff5438..d8b85d6d2 100644
--- a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install
@@ -36,12 +36,12 @@ debian/tmp/opt/trinity/share/apps/remotes/remote.dtd
 debian/tmp/opt/trinity/share/apps/remotes/sherwood.remote.xml
 debian/tmp/opt/trinity/share/apps/remotes/sonytv.remote.xml
 debian/tmp/opt/trinity/share/autostart/irkick.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/irkick/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/irkick/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/irkick/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcmlirc/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcmlirc/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcmlirc/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/irkick/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/irkick/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/irkick/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcmlirc/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcmlirc/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcmlirc/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/irkick.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/irkick.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/irkick.png
diff --git a/ubuntu/maverick/tdeutils/debian/kdf-trinity.install b/ubuntu/maverick/tdeutils/debian/kdf-trinity.install
index e259b569b..074e2f7f8 100644
--- a/ubuntu/maverick/tdeutils/debian/kdf-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/kdf-trinity.install
@@ -8,14 +8,14 @@ debian/tmp/opt/trinity/share/applications/kde/kwikdisk.desktop
 debian/tmp/opt/trinity/share/apps/kdf/kdfui.rc
 debian/tmp/opt/trinity/share/apps/kdf/pics/delete.png
 debian/tmp/opt/trinity/share/apps/kdf/pics/tick.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdf/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdf/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdf/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdf/kdf.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdf/kdf_config.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/blockdevices/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/blockdevices/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kinfocenter/blockdevices/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/kdf.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/kdf_config.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/blockdevices/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/blockdevices/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/blockdevices/index.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmdf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmdf.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmdf.png
diff --git a/ubuntu/maverick/tdeutils/debian/kedit-trinity.install b/ubuntu/maverick/tdeutils/debian/kedit-trinity.install
index 9e70f971b..b344d4a03 100644
--- a/ubuntu/maverick/tdeutils/debian/kedit-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/kedit-trinity.install
@@ -5,9 +5,9 @@ debian/tmp/opt/trinity/lib/libtdeinit_kedit.so
 debian/tmp/opt/trinity/share/applications/kde/KEdit.desktop
 debian/tmp/opt/trinity/share/apps/kedit/keditui.rc
 debian/tmp/opt/trinity/share/config.kcfg/kedit.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kedit/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kedit/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kedit/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kedit/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kedit/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kedit/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kedit.png
diff --git a/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.install b/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.install
index aa0b7f353..25738bfa0 100644
--- a/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.install
@@ -1,9 +1,9 @@
 debian/tmp/opt/trinity/bin/kfloppy
 debian/tmp/opt/trinity/share/applications/kde/KFloppy.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/floppy_format.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kfloppy/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kfloppy/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kfloppy/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfloppy/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfloppy/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfloppy/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kfloppy.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kfloppy.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kfloppy.png
diff --git a/ubuntu/maverick/tdeutils/debian/kgpg-trinity.install b/ubuntu/maverick/tdeutils/debian/kgpg-trinity.install
index e69ad4409..26605d453 100644
--- a/ubuntu/maverick/tdeutils/debian/kgpg-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/kgpg-trinity.install
@@ -26,15 +26,15 @@ debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/encryptfile.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/encryptfolder.desktop
 debian/tmp/opt/trinity/share/autostart/kgpg.desktop
 debian/tmp/opt/trinity/share/config.kcfg/kgpg.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kgpg/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kgpg/editor.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kgpg/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kgpg/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kgpg/keygen.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kgpg/keymanage.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kgpg/keys.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kgpg/kicker.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kgpg/options.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kgpg/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kgpg/editor.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kgpg/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kgpg/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kgpg/keygen.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kgpg/keymanage.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kgpg/keys.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kgpg/kicker.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kgpg/options.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kgpg.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kgpg.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kgpg.png
diff --git a/ubuntu/maverick/tdeutils/debian/khexedit-trinity.install b/ubuntu/maverick/tdeutils/debian/khexedit-trinity.install
index d0e694758..d48280fed 100644
--- a/ubuntu/maverick/tdeutils/debian/khexedit-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/khexedit-trinity.install
@@ -11,10 +11,10 @@ debian/tmp/opt/trinity/share/apps/khexedit/pics/hexdrag.png
 debian/tmp/opt/trinity/share/apps/khexedit/pics/hexmask.png
 debian/tmp/opt/trinity/share/apps/khexedit/pics/hexwrite.png
 debian/tmp/opt/trinity/share/apps/khexedit2part/khexedit2partui.rc
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khexedit/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khexedit/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khexedit/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/khexedit/khexedit1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khexedit/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khexedit/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khexedit/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khexedit/khexedit1.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/khexedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/khexedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/khexedit.png
diff --git a/ubuntu/maverick/tdeutils/debian/kjots-trinity.install b/ubuntu/maverick/tdeutils/debian/kjots-trinity.install
index 37d1c016f..8b117e0b5 100644
--- a/ubuntu/maverick/tdeutils/debian/kjots-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/kjots-trinity.install
@@ -3,9 +3,9 @@ debian/tmp/opt/trinity/share/applications/kde/Kjots.desktop
 debian/tmp/opt/trinity/share/apps/kjots/kjotsui.rc
 debian/tmp/opt/trinity/share/apps/kjots/pics/filedel.png
 debian/tmp/opt/trinity/share/config.kcfg/kjots.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kjots/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kjots/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kjots/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kjots/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kjots/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kjots/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kjots.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kjots.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kjots.png
diff --git a/ubuntu/maverick/tdeutils/debian/klaptopdaemon-trinity.install b/ubuntu/maverick/tdeutils/debian/klaptopdaemon-trinity.install
index 6803ab72e..3e9d1af18 100644
--- a/ubuntu/maverick/tdeutils/debian/klaptopdaemon-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/klaptopdaemon-trinity.install
@@ -24,18 +24,18 @@ debian/tmp/opt/trinity/share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/l
 debian/tmp/opt/trinity/share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_nocharge.png
 debian/tmp/opt/trinity/share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_power.png
 debian/tmp/opt/trinity/share/apps/klaptopdaemon/icons/crystalsvg/32x32/actions/power.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmlowbatcrit/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmlowbatcrit/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmlowbatcrit/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmlowbatwarn/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmlowbatwarn/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmlowbatwarn/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/laptop/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/laptop/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/laptop/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/powerctrl/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/powerctrl/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/powerctrl/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlowbatcrit/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlowbatcrit/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlowbatcrit/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlowbatwarn/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlowbatwarn/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlowbatwarn/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/laptop/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/laptop/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/laptop/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/powerctrl/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/powerctrl/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/powerctrl/index.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/laptop_battery.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/laptop_battery.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/laptop_pcmcia.png
diff --git a/ubuntu/maverick/tdeutils/debian/kregexpeditor-trinity.install b/ubuntu/maverick/tdeutils/debian/kregexpeditor-trinity.install
index 268ea089e..ddb0d489f 100644
--- a/ubuntu/maverick/tdeutils/debian/kregexpeditor-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/kregexpeditor-trinity.install
@@ -22,32 +22,32 @@ debian/tmp/opt/trinity/share/apps/kregexpeditor/pics/verify.png
 debian/tmp/opt/trinity/share/apps/kregexpeditor/pics/wordboundary.png
 debian/tmp/opt/trinity/share/apps/kregexpeditor/predefined/general/anything.regexp
 debian/tmp/opt/trinity/share/apps/kregexpeditor/predefined/general/spaces.regexp
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/altn.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/altntool.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/anychar.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/anychartool.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/begline.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/boundarytools.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/characters.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/charactertool.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/compound.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/compoundtool.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/endline.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/linestartendtool.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/lookaheadtools.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/neglookahead.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/nonwordboundary.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/poslookahead.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/repeat.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/repeattool.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/select.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/text.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/texttool.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/theEditor.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/KRegExpEditor/wordboundary.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/altn.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/altntool.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/anychar.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/anychartool.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/begline.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/boundarytools.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/characters.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/charactertool.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/compound.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/compoundtool.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/endline.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/linestartendtool.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/lookaheadtools.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/neglookahead.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/nonwordboundary.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/poslookahead.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/repeat.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/repeattool.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/select.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/text.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/texttool.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/theEditor.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/KRegExpEditor/wordboundary.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kregexpeditor.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kregexpeditor.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kregexpeditor.png
diff --git a/ubuntu/maverick/tdeutils/debian/ksim-trinity.install b/ubuntu/maverick/tdeutils/debian/ksim-trinity.install
index c1fcb8211..c1d00aefc 100644
--- a/ubuntu/maverick/tdeutils/debian/ksim-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/ksim-trinity.install
@@ -30,9 +30,9 @@ debian/tmp/opt/trinity/share/apps/ksim/themes/ksim/mail/decal_mail.png
 debian/tmp/opt/trinity/share/apps/ksim/themes/ksim/mail/krell_mail.png
 debian/tmp/opt/trinity/share/apps/ksim/themes/ksim/mail/krell_mail_daemon.png
 debian/tmp/opt/trinity/share/apps/ksim/themes/ksim/net/decal_net_leds.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksim/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksim/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ksim/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksim/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksim/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksim/index.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/ksim.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/ksim_cpu.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/ksim.png
diff --git a/ubuntu/maverick/tdeutils/debian/ktimer-trinity.install b/ubuntu/maverick/tdeutils/debian/ktimer-trinity.install
index fcca58508..abebef83d 100644
--- a/ubuntu/maverick/tdeutils/debian/ktimer-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/ktimer-trinity.install
@@ -1,8 +1,8 @@
 debian/tmp/opt/trinity/bin/ktimer
 debian/tmp/opt/trinity/share/applications/kde/ktimer.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ktimer/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ktimer/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/ktimer/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ktimer/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ktimer/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/ktimer/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/ktimer.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/ktimer.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/ktimer.png
diff --git a/ubuntu/maverick/tdeutils/debian/kwalletmanager-trinity.install b/ubuntu/maverick/tdeutils/debian/kwalletmanager-trinity.install
index f711c47b8..250eb2390 100644
--- a/ubuntu/maverick/tdeutils/debian/kwalletmanager-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/kwalletmanager-trinity.install
@@ -10,17 +10,17 @@ debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/
 debian/tmp/opt/trinity/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png
 debian/tmp/opt/trinity/share/apps/kwalletmanager/kwalleteditor.rc
 debian/tmp/opt/trinity/share/apps/kwalletmanager/kwalletmanager.rc
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kwallet/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kwallet/cr22-action-wallet_closed.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kwallet/cr22-action-wallet_open.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kwallet/edit1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kwallet/edit2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kwallet/edit3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kwallet/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kwallet/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kwallet/kwalletmanager.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kwallet/password1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kwallet/password2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/cr22-action-wallet_closed.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/cr22-action-wallet_open.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/edit3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/kwalletmanager.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/password1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kwallet/password2.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kwalletmanager.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kwalletmanager.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kwalletmanager.png
diff --git a/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.install b/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.install
index 998005283..12daea5ba 100644
--- a/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.install
@@ -1,9 +1,9 @@
 debian/tmp/opt/trinity/bin/superkaramba
 debian/tmp/opt/trinity/share/applnk/Utilities/superkaramba.desktop
 debian/tmp/opt/trinity/share/apps/superkaramba/superkarambaui.rc
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/superkaramba/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/superkaramba/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/superkaramba/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/superkaramba/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/superkaramba/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/superkaramba/index.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/superkaramba.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/superkaramba_theme.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/superkaramba.png
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.ark b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.ark
index 0e97619df..4839265ea 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.ark
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.ark
@@ -5,6 +5,6 @@ Abstract: Ark is an archive manager for KDE
 Section: Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/ark/index.html
-Files: /usr/share/doc/kde/HTML/en/ark/*.html
+Index: /usr/share/doc/tde/HTML/en/ark/index.html
+Files: /usr/share/doc/tde/HTML/en/ark/*.html
 
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.irkick b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.irkick
index d092a6895..2fc211a4e 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.irkick
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.irkick
@@ -6,6 +6,6 @@ Abstract: KDE LIRC is the infrastructure for the KDE's Infrared Remote
 Section: Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/irkick/index.html
-Files: /usr/share/doc/kde/HTML/en/irkick/*.html
+Index: /usr/share/doc/tde/HTML/en/irkick/index.html
+Files: /usr/share/doc/tde/HTML/en/irkick/*.html
 
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcalc b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcalc
index d256e4ec2..110d46ab3 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcalc
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcalc
@@ -5,6 +5,6 @@ Abstract: KCalc is a scientific calculator for KDE
 Section: Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kcalc/index.html
-Files: /usr/share/doc/kde/HTML/en/kcalc/*.html
+Index: /usr/share/doc/tde/HTML/en/kcalc/index.html
+Files: /usr/share/doc/tde/HTML/en/kcalc/*.html
 
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcmlirc b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcmlirc
index 8bfe05da5..410d473c9 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcmlirc
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcmlirc
@@ -5,6 +5,6 @@ Abstract: The infrastructure for the KDE's Infrared Remote Control functionality
 Section: Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kcmlirc/index.html
-Files: /usr/share/doc/kde/HTML/en/kcmlirc/*.html
+Index: /usr/share/doc/tde/HTML/en/kcmlirc/index.html
+Files: /usr/share/doc/tde/HTML/en/kcmlirc/*.html
 
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kdf b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kdf
index f6899de71..6a664155b 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kdf
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kdf
@@ -5,7 +5,7 @@ Abstract: KDiskFree displays available file devices, along with information abou
 Section: Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kdf/index.html
-Files: /usr/share/doc/kde/HTML/en/kdf/*.html
+Index: /usr/share/doc/tde/HTML/en/kdf/index.html
+Files: /usr/share/doc/tde/HTML/en/kdf/*.html
 
 
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kedit b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kedit
index 602125435..1493ebe28 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kedit
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kedit
@@ -5,6 +5,6 @@ Abstract: KEdit is a simple text editor for KDE
 Section: Editors
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kedit/index.html
-Files: /usr/share/doc/kde/HTML/en/kedit/*.html
+Index: /usr/share/doc/tde/HTML/en/kedit/index.html
+Files: /usr/share/doc/tde/HTML/en/kedit/*.html
 
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kfloppy b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kfloppy
index 8aab12e6f..5c0f071fb 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kfloppy
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kfloppy
@@ -6,7 +6,7 @@ Abstract: KFloppy Formatter is a utility that provides a straightforward
 Section: System
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kfloppy/index.html
-Files: /usr/share/doc/kde/HTML/en/kfloppy/*.html
+Index: /usr/share/doc/tde/HTML/en/kfloppy/index.html
+Files: /usr/share/doc/tde/HTML/en/kfloppy/*.html
 
 
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kgpg b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kgpg
index 47c588ed3..5f176e443 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kgpg
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kgpg
@@ -5,6 +5,6 @@ Abstract: KGPG is a simple graphical interface for GnuPG
 Section: Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kgpg/index.html
-Files: /usr/share/doc/kde/HTML/en/kgpg/*.html
+Index: /usr/share/doc/tde/HTML/en/kgpg/index.html
+Files: /usr/share/doc/tde/HTML/en/kgpg/*.html
 
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.khexedit b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.khexedit
index 8ffc260a1..983e2c3b7 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.khexedit
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.khexedit
@@ -5,6 +5,6 @@ Abstract: KHexEdit is a hexadecimal editor for KDE
 Section: Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/khexedit/index.html
-Files: /usr/share/doc/kde/HTML/en/khexedit/*.html
+Index: /usr/share/doc/tde/HTML/en/khexedit/index.html
+Files: /usr/share/doc/tde/HTML/en/khexedit/*.html
 
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kjots b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kjots
index 94c1e3117..753a35e4f 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kjots
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kjots
@@ -5,6 +5,6 @@ Abstract: KJots is a small program which is handy for keeping miscellaneous note
 Section: Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kjots/index.html
-Files: /usr/share/doc/kde/HTML/en/kjots/*.html
+Index: /usr/share/doc/tde/HTML/en/kjots/index.html
+Files: /usr/share/doc/tde/HTML/en/kjots/*.html
 
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kregexpeditor b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kregexpeditor
index 82c7f091c..a0bd5f21d 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kregexpeditor
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kregexpeditor
@@ -5,5 +5,5 @@ Abstract: This Handbook describes the Regular Expression Editor widget
 Section: Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/KRegExpEditor/index.html
-Files: /usr/share/doc/kde/HTML/en/KRegExpEditor/*.html
+Index: /usr/share/doc/tde/HTML/en/KRegExpEditor/index.html
+Files: /usr/share/doc/tde/HTML/en/KRegExpEditor/*.html
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet
index f80266346..6331a925f 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kwallet
@@ -5,6 +5,6 @@ Abstract: The wallet subsytem provides a convenient and secure way to manage all
 Section: Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kwallet/index.html
-Files: /usr/share/doc/kde/HTML/en/kwallet/*.html
+Index: /usr/share/doc/tde/HTML/en/kwallet/index.html
+Files: /usr/share/doc/tde/HTML/en/kwallet/*.html
 
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.superkaramba b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.superkaramba
index 1ae06caa7..d9f8a21ce 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.superkaramba
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.superkaramba
@@ -9,5 +9,5 @@ Abstract: This Handbook documents the Superkaramba API
 Section: Tools
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/superkaramba/index.html
-Files: /usr/share/doc/kde/HTML/en/superkaramba/*.html
+Index: /usr/share/doc/tde/HTML/en/superkaramba/index.html
+Files: /usr/share/doc/tde/HTML/en/superkaramba/*.html
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-doc.install b/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-doc.install
index 669742a1b..745e17452 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-doc.install
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-doc.install
@@ -1 +1 @@
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdeutils*-apidocs/* /opt/trinity/share/doc/kde/HTML/en/tdeutils-apidocs
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeutils*-apidocs/* /opt/trinity/share/doc/tde/HTML/en/tdeutils-apidocs
diff --git a/ubuntu/maverick/tdevelop/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdevelop/debian/cdbs/debian-qt-kde.mk
index cae625265..d135c4257 100644
--- a/ubuntu/maverick/tdevelop/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdevelop/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/tdevelop/debian/cdbs/kde.mk b/ubuntu/maverick/tdevelop/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/tdevelop/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdevelop/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/tdevelop/debian/rules b/ubuntu/maverick/tdevelop/debian/rules
index 21f2c166a..20946aeb3 100755
--- a/ubuntu/maverick/tdevelop/debian/rules
+++ b/ubuntu/maverick/tdevelop/debian/rules
@@ -47,7 +47,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
 				--enable-vba \
 				--enable-subversion \
 				--with-pic \
-				--with-tdelibsdoxy-dir=/opt/trinity/share/doc/kde/HTML/en/tdelibs-apidocs \
+				--with-tdelibsdoxy-dir=/opt/trinity/share/doc/tde/HTML/en/tdelibs-apidocs \
 				--with-pythondir=/usr \
 				--with-qtdoc-dir=/usr/share/qt3/doc/html \
 				--prefix=/opt/trinity \
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-doc.install b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-doc.install
index 0f80b5149..765acf0e0 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-doc.install
+++ b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-doc.install
@@ -1,7 +1,7 @@
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdevelop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdevelop-apidocs/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kde_app_devel/appwizard.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kde_app_devel/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kde_app_devel/kscribblefiles.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kde_app_devel/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kde_app_devel/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdevelop
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdevelop-apidocs/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/appwizard.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/kscribblefiles.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kde_app_devel/common
diff --git a/ubuntu/maverick/tdewebdev/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdewebdev/debian/cdbs/debian-qt-kde.mk
index cae625265..d135c4257 100644
--- a/ubuntu/maverick/tdewebdev/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdewebdev/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/tdewebdev/debian/cdbs/kde.mk b/ubuntu/maverick/tdewebdev/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/tdewebdev/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdewebdev/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/tdewebdev/debian/control b/ubuntu/maverick/tdewebdev/debian/control
index d98b6a46f..aa43e2137 100644
--- a/ubuntu/maverick/tdewebdev/debian/control
+++ b/ubuntu/maverick/tdewebdev/debian/control
@@ -37,8 +37,8 @@ Description: KDE web development documentation in HTML format [Trinity]
  to HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /opt/trinity/share/doc/kde/HTML/<language>/<app>/, for instance
- /opt/trinity/share/doc/kde/HTML/en/quanta/. Documentation is provided for most
+ /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
+ /opt/trinity/share/doc/tde/HTML/en/quanta/. Documentation is provided for most
  KDE web development packages.
  .
  This package is part of KDE, as a component of the KDE web development module.
diff --git a/ubuntu/maverick/tdewebdev/debian/control.in b/ubuntu/maverick/tdewebdev/debian/control.in
index 91b26e274..ff206c5b5 100644
--- a/ubuntu/maverick/tdewebdev/debian/control.in
+++ b/ubuntu/maverick/tdewebdev/debian/control.in
@@ -33,8 +33,8 @@ Description: KDE web development documentation in HTML format
  to HTML format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /opt/trinity/share/doc/kde/HTML/<language>/<app>/, for instance
- /opt/trinity/share/doc/kde/HTML/en/quanta/. Documentation is provided for most
+ /opt/trinity/share/doc/tde/HTML/<language>/<app>/, for instance
+ /opt/trinity/share/doc/tde/HTML/en/quanta/. Documentation is provided for most
  KDE web development packages.
  .
  This package is part of KDE, as a component of the KDE web development module.
diff --git a/ubuntu/maverick/tdewebdev/debian/kfilereplace-trinity.install b/ubuntu/maverick/tdewebdev/debian/kfilereplace-trinity.install
index ea0c71bee..368c9640b 100644
--- a/ubuntu/maverick/tdewebdev/debian/kfilereplace-trinity.install
+++ b/ubuntu/maverick/tdewebdev/debian/kfilereplace-trinity.install
@@ -4,10 +4,10 @@ debian/tmp/opt/trinity/lib/trinity/libkfilereplacepart.so
 debian/tmp/opt/trinity/share/applications/kde/kfilereplace.desktop
 debian/tmp/opt/trinity/share/apps/kfilereplace/kfilereplaceui.rc
 debian/tmp/opt/trinity/share/apps/kfilereplacepart
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kfilereplace/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kfilereplace/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kfilereplace/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kfilereplace/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfilereplace/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfilereplace/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfilereplace/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfilereplace/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kfilereplace.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kfilereplace.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kfilereplace.png
diff --git a/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.install b/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.install
index f483a219b..f65852c45 100644
--- a/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.install
+++ b/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.install
@@ -7,10 +7,10 @@ debian/tmp/opt/trinity/share/applications/kde/klinkstatus.desktop
 debian/tmp/opt/trinity/share/apps/klinkstatus
 debian/tmp/opt/trinity/share/apps/klinkstatuspart
 debian/tmp/opt/trinity/share/config.kcfg/klinkstatus.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/klinkstatus/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/klinkstatus/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/klinkstatus/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/klinkstatus/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/klinkstatus/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/klinkstatus/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/klinkstatus/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/klinkstatus/*.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/bug.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/klinkstatus.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/klinkstatus.png
diff --git a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.install b/ubuntu/maverick/tdewebdev/debian/kommander-trinity.install
index 230dadb45..a95d024c1 100644
--- a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.install
+++ b/ubuntu/maverick/tdewebdev/debian/kommander-trinity.install
@@ -12,10 +12,10 @@ debian/tmp/opt/trinity/share/applications/kde/kmdr-editor.desktop
 debian/tmp/opt/trinity/share/applnk/.hidden/kmdr-executor.desktop
 debian/tmp/opt/trinity/share/apps/katepart/syntax/kommander.xml
 debian/tmp/opt/trinity/share/apps/kommander/pics/kommandersplash.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kommander/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kommander/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kommander/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kommander/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kommander/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kommander/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kommander/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kommander/*.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kommander.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kommander.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kommander.png
diff --git a/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.install b/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.install
index 71ccaf3ec..84fec5328 100644
--- a/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.install
+++ b/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.install
@@ -5,14 +5,14 @@ debian/tmp/opt/trinity/lib/trinity/libkxsldbgpart.so
 debian/tmp/opt/trinity/share/applications/kde/kxsldbg.desktop
 debian/tmp/opt/trinity/share/apps/kxsldbg
 debian/tmp/opt/trinity/share/apps/kxsldbgpart
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kxsldbg/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kxsldbg/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kxsldbg/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kxsldbg/*.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/xsldbg/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/xsldbg/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/xsldbg/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/xsldbg/xsldbghelp.xml
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxsldbg/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxsldbg/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxsldbg/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxsldbg/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/xsldbghelp.xml
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/1downarrow.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/configure.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/exit.png
diff --git a/ubuntu/maverick/tdewebdev/debian/man/klinkstatus-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/klinkstatus-trinity.1
index 58ad198eb..29cefaaa6 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/klinkstatus-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/klinkstatus-trinity.1
@@ -44,7 +44,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdewebdev-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/klinkstatus/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/klinkstatus/\fP.
 .SH AUTHOR
 KLinkStatus was written by Paulo Moura Guedes <moura@tdewebdev.org>.
 .br
diff --git a/ubuntu/maverick/tdewebdev/debian/man/kmdr-editor-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/kmdr-editor-trinity.1
index e1865905e..d1568791b 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/kmdr-editor-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/kmdr-editor-trinity.1
@@ -60,7 +60,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdewebdev-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kommander/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kommander/\fP.
 .SH AUTHOR
 Kommander was written by Marc Britton <consume@optusnet.com.au>,
 Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@tdewebdev.org>,
diff --git a/ubuntu/maverick/tdewebdev/debian/man/kmdr-executor-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/kmdr-executor-trinity.1
index f5b69feaf..554bf6124 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/kmdr-executor-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/kmdr-executor-trinity.1
@@ -77,7 +77,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdewebdev-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kommander/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kommander/\fP.
 .SH AUTHOR
 Kommander was written by Marc Britton <consume@optusnet.com.au>,
 Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@tdewebdev.org>,
diff --git a/ubuntu/maverick/tdewebdev/debian/man/kmdr-plugins-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/kmdr-plugins-trinity.1
index 51987bd96..42f0333b6 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/kmdr-plugins-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/kmdr-plugins-trinity.1
@@ -61,7 +61,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdewebdev-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kommander/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kommander/\fP.
 .SH AUTHOR
 Kommander was written by Marc Britton <consume@optusnet.com.au>,
 Eric Laffoon <sequitur@kde.org>, Michal Rudolf <mrudolf@tdewebdev.org>,
diff --git a/ubuntu/maverick/tdewebdev/debian/man/kxsldbg-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/kxsldbg-trinity.1
index 918746a9e..fff33bb9d 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/kxsldbg-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/kxsldbg-trinity.1
@@ -46,7 +46,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdewebdev-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/kxsldbg/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/kxsldbg/\fP.
 .SH AUTHOR
 KXSLDbg was written by Keith Isdale <k_isdale@tpg.com.au>.
 .br
diff --git a/ubuntu/maverick/tdewebdev/debian/man/quanta-trinity.1 b/ubuntu/maverick/tdewebdev/debian/man/quanta-trinity.1
index 4880e9546..56c53ce9f 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/quanta-trinity.1
+++ b/ubuntu/maverick/tdewebdev/debian/man/quanta-trinity.1
@@ -61,7 +61,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fItdewebdev-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/kde/HTML/en/quanta/\fP.
+\fI/opt/trinity/share/doc/tde/HTML/en/quanta/\fP.
 .SH AUTHOR
 Quanta was written by Eric Laffoon <sequitur@kde.org>, Andras Mantia
 <amantia@kde.org> and others including inactive authors
diff --git a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.install b/ubuntu/maverick/tdewebdev/debian/quanta-trinity.install
index 638a01597..7b3618363 100644
--- a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.install
+++ b/ubuntu/maverick/tdewebdev/debian/quanta-trinity.install
@@ -8,10 +8,10 @@ debian/tmp/opt/trinity/lib/trinity/quantadebuggergubed.la
 debian/tmp/opt/trinity/lib/trinity/quantadebuggergubed.so
 debian/tmp/opt/trinity/share/applications/kde/quanta.desktop
 debian/tmp/opt/trinity/share/apps/kafkapart
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/quanta/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/quanta/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/quanta/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/quanta/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/quanta/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/quanta/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/quanta/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/quanta/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/quanta.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/quanta.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/quanta.png
diff --git a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.lintian b/ubuntu/maverick/tdewebdev/debian/quanta-trinity.lintian
index 708fdef4d..09ae4739d 100644
--- a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.lintian
+++ b/ubuntu/maverick/tdewebdev/debian/quanta-trinity.lintian
@@ -1,4 +1,4 @@
 # This tag is required for apps already in the KDE menu.
 quanta: menu-item-contains-unknown-tag kderemove /opt/trinity/lib/menu/quanta:9
 # This is part of the docbook docs.
-quanta: extra-license-file opt/trinity/share/doc/kde/HTML/en/quanta/credits-license.docbook
+quanta: extra-license-file opt/trinity/share/doc/tde/HTML/en/quanta/credits-license.docbook
diff --git a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kfilereplace b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kfilereplace
index c2358003b..8e685ddea 100644
--- a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kfilereplace
+++ b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kfilereplace
@@ -5,6 +5,6 @@ Abstract: KFileReplace is an utility to search and replace strings.
 Section: Apps/Net
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kfilereplace/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kfilereplace/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kfilereplace/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kfilereplace/*.html
 
diff --git a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.klinkstatus b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.klinkstatus
index cc174bd07..3113acaad 100644
--- a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.klinkstatus
+++ b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.klinkstatus
@@ -5,6 +5,6 @@ Abstract: KLinkStatus is a link checker for KDE.
 Section: Apps/Net
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/klinkstatus/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/klinkstatus/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/klinkstatus/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/klinkstatus/*.html
 
diff --git a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kommander b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kommander
index c9cd8f0ce..233657324 100644
--- a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kommander
+++ b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kommander
@@ -13,6 +13,6 @@ Abstract: Kommander is a set of tools that allow you to create dynamic
 Section: Apps/Tools
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kommander/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kommander/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kommander/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kommander/*.html
 
diff --git a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kxsldbg b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kxsldbg
index f60f9dfa0..2f14db1f4 100644
--- a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kxsldbg
+++ b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kxsldbg
@@ -6,6 +6,6 @@ Abstract: KXsldbg provides a graphical user interface front-end to
 Section: Apps/Text
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/kxsldbg/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/kxsldbg/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kxsldbg/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kxsldbg/*.html
 
diff --git a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.quanta b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.quanta
index 4f14507b6..6d8e92956 100644
--- a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.quanta
+++ b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.quanta
@@ -8,6 +8,6 @@ Abstract: Quanta Plus is a Web IDE that strives to be neutral and
 Section: Apps/Editors
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/quanta/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/quanta/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/quanta/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/quanta/*.html
 
diff --git a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.xsldbg b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.xsldbg
index 6c81a9924..e4147f24f 100644
--- a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.xsldbg
+++ b/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.xsldbg
@@ -5,6 +5,6 @@ Abstract: xlsdbg is a XSLT scripts debbuger.
 Section: Apps/Text
 
 Format: HTML
-Index: /opt/trinity/share/doc/kde/HTML/en/xsldbg/index.html
-Files: /opt/trinity/share/doc/kde/HTML/en/xsldbg/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/xsldbg/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/xsldbg/*.html