diff --git a/doc/tdeioslave/CMakeLists.txt b/doc/tdeioslave/CMakeLists.txt
index 5446ddbea..6bc5f1878 100644
--- a/doc/tdeioslave/CMakeLists.txt
+++ b/doc/tdeioslave/CMakeLists.txt
@@ -1,12 +1,9 @@
 #################################################
 #
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
 #  Improvements and feedback are welcome
 #
 #  This file is released under GPL >= 2
 #
 #################################################
 
-tde_create_handbook( DESTINATION tdeioslave )
+tde_auto_add_subdirectories()
diff --git a/doc/tdeioslave/Makefile.am b/doc/tdeioslave/Makefile.am
index 085981d9b..561d25fa8 100644
--- a/doc/tdeioslave/Makefile.am
+++ b/doc/tdeioslave/Makefile.am
@@ -1,4 +1,4 @@
-
+SUBDIRS = $(AUTODIRS)
 KDE_LANG = en
 KDE_DOCS = AUTO
 
diff --git a/doc/tdeioslave/bzip/CMakeLists.txt b/doc/tdeioslave/bzip/CMakeLists.txt
new file mode 100644
index 000000000..dedc3164a
--- /dev/null
+++ b/doc/tdeioslave/bzip/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/bzip )
diff --git a/doc/tdeioslave/bzip/Makefile.am b/doc/tdeioslave/bzip/Makefile.am
new file mode 100644
index 000000000..087ba456b
--- /dev/null
+++ b/doc/tdeioslave/bzip/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/bzip
diff --git a/doc/tdeioslave/bzip.docbook b/doc/tdeioslave/bzip/index.docbook
similarity index 82%
rename from doc/tdeioslave/bzip.docbook
rename to doc/tdeioslave/bzip/index.docbook
index e4e7d1bff..be3ff6cbd 100644
--- a/doc/tdeioslave/bzip.docbook
+++ b/doc/tdeioslave/bzip/index.docbook
@@ -1,3 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="bzip">
 <title>bzip</title>
 <articleinfo>
diff --git a/doc/tdeioslave/bzip2/CMakeLists.txt b/doc/tdeioslave/bzip2/CMakeLists.txt
new file mode 100644
index 000000000..a0b075b65
--- /dev/null
+++ b/doc/tdeioslave/bzip2/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/bzip2 )
diff --git a/doc/tdeioslave/bzip2/Makefile.am b/doc/tdeioslave/bzip2/Makefile.am
new file mode 100644
index 000000000..500535105
--- /dev/null
+++ b/doc/tdeioslave/bzip2/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/bzip2
diff --git a/doc/tdeioslave/bzip2.docbook b/doc/tdeioslave/bzip2/index.docbook
similarity index 82%
rename from doc/tdeioslave/bzip2.docbook
rename to doc/tdeioslave/bzip2/index.docbook
index ecc2b2e29..3794a825f 100644
--- a/doc/tdeioslave/bzip2.docbook
+++ b/doc/tdeioslave/bzip2/index.docbook
@@ -1,3 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="bzip2">
 <title>bzip2</title>
 <articleinfo>
diff --git a/doc/tdeioslave/cgi/CMakeLists.txt b/doc/tdeioslave/cgi/CMakeLists.txt
new file mode 100644
index 000000000..603ba3ea5
--- /dev/null
+++ b/doc/tdeioslave/cgi/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/cgi )
diff --git a/doc/tdeioslave/cgi/Makefile.am b/doc/tdeioslave/cgi/Makefile.am
new file mode 100644
index 000000000..600bef9f3
--- /dev/null
+++ b/doc/tdeioslave/cgi/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/cgi
diff --git a/doc/tdeioslave/cgi.docbook b/doc/tdeioslave/cgi/index.docbook
similarity index 80%
rename from doc/tdeioslave/cgi.docbook
rename to doc/tdeioslave/cgi/index.docbook
index 5df94da13..0499cb1b4 100644
--- a/doc/tdeioslave/cgi.docbook
+++ b/doc/tdeioslave/cgi/index.docbook
@@ -1,3 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="cgi">
 <title>cgi</title>
 <articleinfo>
diff --git a/doc/tdeioslave/data/CMakeLists.txt b/doc/tdeioslave/data/CMakeLists.txt
new file mode 100644
index 000000000..60910d4cc
--- /dev/null
+++ b/doc/tdeioslave/data/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/data )
diff --git a/doc/tdeioslave/data/Makefile.am b/doc/tdeioslave/data/Makefile.am
new file mode 100644
index 000000000..b542e7870
--- /dev/null
+++ b/doc/tdeioslave/data/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/data
diff --git a/doc/tdeioslave/data.docbook b/doc/tdeioslave/data/index.docbook
similarity index 87%
rename from doc/tdeioslave/data.docbook
rename to doc/tdeioslave/data/index.docbook
index ca0e4e9a5..68d1b3d0a 100644
--- a/doc/tdeioslave/data.docbook
+++ b/doc/tdeioslave/data/index.docbook
@@ -1,3 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="data">
 <title>Data URLs</title>
 
diff --git a/doc/tdeioslave/file/CMakeLists.txt b/doc/tdeioslave/file/CMakeLists.txt
new file mode 100644
index 000000000..b9e1be9a1
--- /dev/null
+++ b/doc/tdeioslave/file/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/file )
diff --git a/doc/tdeioslave/file/Makefile.am b/doc/tdeioslave/file/Makefile.am
new file mode 100644
index 000000000..b1b780ad2
--- /dev/null
+++ b/doc/tdeioslave/file/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/file
diff --git a/doc/tdeioslave/file.docbook b/doc/tdeioslave/file/index.docbook
similarity index 58%
rename from doc/tdeioslave/file.docbook
rename to doc/tdeioslave/file/index.docbook
index 6d19b0436..e02842154 100644
--- a/doc/tdeioslave/file.docbook
+++ b/doc/tdeioslave/file/index.docbook
@@ -1,3 +1,10 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY Ferdinand.Gassauer '<personname><firstname>Ferdinand</firstname><surname>Gassauer</surname></personname>'>
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="file">
 <title>file</title>
 <articleinfo>
diff --git a/doc/tdeioslave/finger/CMakeLists.txt b/doc/tdeioslave/finger/CMakeLists.txt
new file mode 100644
index 000000000..48ce09a89
--- /dev/null
+++ b/doc/tdeioslave/finger/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/finger )
diff --git a/doc/tdeioslave/finger/Makefile.am b/doc/tdeioslave/finger/Makefile.am
new file mode 100644
index 000000000..f10e4b3d4
--- /dev/null
+++ b/doc/tdeioslave/finger/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/finger
diff --git a/doc/tdeioslave/finger.docbook b/doc/tdeioslave/finger/index.docbook
similarity index 84%
rename from doc/tdeioslave/finger.docbook
rename to doc/tdeioslave/finger/index.docbook
index b3678fc4d..cb49c3c3d 100644
--- a/doc/tdeioslave/finger.docbook
+++ b/doc/tdeioslave/finger/index.docbook
@@ -1,3 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="finger">
 <title>finger</title>
 <articleinfo>
diff --git a/doc/tdeioslave/fish/CMakeLists.txt b/doc/tdeioslave/fish/CMakeLists.txt
new file mode 100644
index 000000000..f61201bcb
--- /dev/null
+++ b/doc/tdeioslave/fish/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/fish )
diff --git a/doc/tdeioslave/fish/Makefile.am b/doc/tdeioslave/fish/Makefile.am
new file mode 100644
index 000000000..4a3e8575d
--- /dev/null
+++ b/doc/tdeioslave/fish/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/fish
diff --git a/doc/tdeioslave/fish.docbook b/doc/tdeioslave/fish/index.docbook
similarity index 93%
rename from doc/tdeioslave/fish.docbook
rename to doc/tdeioslave/fish/index.docbook
index 577199e8b..3d35d055e 100644
--- a/doc/tdeioslave/fish.docbook
+++ b/doc/tdeioslave/fish/index.docbook
@@ -1,3 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="fish">
 <title>fish</title>
 <articleinfo>
diff --git a/doc/tdeioslave/floppy/CMakeLists.txt b/doc/tdeioslave/floppy/CMakeLists.txt
new file mode 100644
index 000000000..eb53e2871
--- /dev/null
+++ b/doc/tdeioslave/floppy/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/floppy )
diff --git a/doc/tdeioslave/floppy/Makefile.am b/doc/tdeioslave/floppy/Makefile.am
new file mode 100644
index 000000000..0ef5c361d
--- /dev/null
+++ b/doc/tdeioslave/floppy/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/floppy
diff --git a/doc/tdeioslave/floppy.docbook b/doc/tdeioslave/floppy/index.docbook
similarity index 89%
rename from doc/tdeioslave/floppy.docbook
rename to doc/tdeioslave/floppy/index.docbook
index 5a75ba25c..cabe3323e 100644
--- a/doc/tdeioslave/floppy.docbook
+++ b/doc/tdeioslave/floppy/index.docbook
@@ -1,3 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="floppy">
 <title>Floppy</title>
 <articleinfo>
diff --git a/doc/tdeioslave/ftp/CMakeLists.txt b/doc/tdeioslave/ftp/CMakeLists.txt
new file mode 100644
index 000000000..4d236074f
--- /dev/null
+++ b/doc/tdeioslave/ftp/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/ftp )
diff --git a/doc/tdeioslave/ftp/Makefile.am b/doc/tdeioslave/ftp/Makefile.am
new file mode 100644
index 000000000..add273d90
--- /dev/null
+++ b/doc/tdeioslave/ftp/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/ftp
diff --git a/doc/tdeioslave/ftp.docbook b/doc/tdeioslave/ftp/index.docbook
similarity index 87%
rename from doc/tdeioslave/ftp.docbook
rename to doc/tdeioslave/ftp/index.docbook
index eb9e7056c..6d8eda542 100644
--- a/doc/tdeioslave/ftp.docbook
+++ b/doc/tdeioslave/ftp/index.docbook
@@ -1,3 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article id="ftp">
 <title>&FTP;</title>
 <articleinfo>
diff --git a/doc/tdeioslave/gopher/CMakeLists.txt b/doc/tdeioslave/gopher/CMakeLists.txt
new file mode 100644
index 000000000..50339b1ae
--- /dev/null
+++ b/doc/tdeioslave/gopher/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/gopher )
diff --git a/doc/tdeioslave/gopher/Makefile.am b/doc/tdeioslave/gopher/Makefile.am
new file mode 100644
index 000000000..394212568
--- /dev/null
+++ b/doc/tdeioslave/gopher/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/gopher
diff --git a/doc/tdeioslave/gopher.docbook b/doc/tdeioslave/gopher/index.docbook
similarity index 87%
rename from doc/tdeioslave/gopher.docbook
rename to doc/tdeioslave/gopher/index.docbook
index 29e418faf..ba131cdea 100644
--- a/doc/tdeioslave/gopher.docbook
+++ b/doc/tdeioslave/gopher/index.docbook
@@ -1,3 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="gopher">
 <title>gopher</title>
 <articleinfo>
diff --git a/doc/tdeioslave/gzip/CMakeLists.txt b/doc/tdeioslave/gzip/CMakeLists.txt
new file mode 100644
index 000000000..c117762f2
--- /dev/null
+++ b/doc/tdeioslave/gzip/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/gzip )
diff --git a/doc/tdeioslave/gzip/Makefile.am b/doc/tdeioslave/gzip/Makefile.am
new file mode 100644
index 000000000..2dc4fdbf7
--- /dev/null
+++ b/doc/tdeioslave/gzip/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/gzip
diff --git a/doc/tdeioslave/gzip.docbook b/doc/tdeioslave/gzip/index.docbook
similarity index 82%
rename from doc/tdeioslave/gzip.docbook
rename to doc/tdeioslave/gzip/index.docbook
index 03a6b9964..9ce096c37 100644
--- a/doc/tdeioslave/gzip.docbook
+++ b/doc/tdeioslave/gzip/index.docbook
@@ -1,3 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="gzip">
 <title>gzip</title>
 <articleinfo>
diff --git a/doc/tdeioslave/help.docbook b/doc/tdeioslave/help.docbook
deleted file mode 100644
index 43b806de8..000000000
--- a/doc/tdeioslave/help.docbook
+++ /dev/null
@@ -1,17 +0,0 @@
-<article lang="&language;" id="help">
-<title>help</title>
-<articleinfo>
-<authorgroup>
-<author>&Ferdinand.Gassauer;&Ferdinand.Gassauer.mail;</author>
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-</authorgroup>
-</articleinfo>
-
-<para>
-The help system of &tde;
-</para>
-<para>
- See  <ulink url="help:/">The &khelpcenter;</ulink>.
-</para>
-
-</article>
diff --git a/doc/tdeioslave/help/CMakeLists.txt b/doc/tdeioslave/help/CMakeLists.txt
new file mode 100644
index 000000000..a27480f34
--- /dev/null
+++ b/doc/tdeioslave/help/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/help )
diff --git a/doc/tdeioslave/help/Makefile.am b/doc/tdeioslave/help/Makefile.am
new file mode 100644
index 000000000..4f13c4457
--- /dev/null
+++ b/doc/tdeioslave/help/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/help
diff --git a/doc/tdeioslave/help/index.docbook b/doc/tdeioslave/help/index.docbook
new file mode 100644
index 000000000..f5d67084e
--- /dev/null
+++ b/doc/tdeioslave/help/index.docbook
@@ -0,0 +1,24 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY Ferdinand.Gassauer '<personname><firstname>Ferdinand</firstname><surname>Gassauer</surname></personname>'>
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
+<article lang="&language;" id="help">
+<title>help</title>
+<articleinfo>
+<authorgroup>
+<author>&Ferdinand.Gassauer;&Ferdinand.Gassauer.mail;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+</articleinfo>
+
+<para>
+The help system of &tde;
+</para>
+<para>
+ See  <ulink url="help:/">The &khelpcenter;</ulink>.
+</para>
+
+</article>
diff --git a/doc/tdeioslave/http.docbook b/doc/tdeioslave/http.docbook
deleted file mode 100644
index 535370b66..000000000
--- a/doc/tdeioslave/http.docbook
+++ /dev/null
@@ -1,25 +0,0 @@
-<article lang="&language;" id="http">
-<title>http</title>
-<articleinfo>
-<authorgroup>
-<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-</authorgroup>
-</articleinfo>
-
-<para><acronym>http</acronym> is the
-<emphasis>H</emphasis>yper<emphasis>T</emphasis>ext
-<emphasis>T</emphasis>ransfer <emphasis>P</emphasis>rotocol.</para>
-
-<para>The http tdeioslave is used by all &tde; applications to handle
-connections to http servers, that is, web servers.  The most common
-usage is to view web pages in the &konqueror; web browser.</para>
-
-<para>You can use the http tdeioslave in &konqueror; by giving it a
-<acronym>URL</acronym>.  
-<userinput>http://<replaceable>www.kde.org</replaceable></userinput>.</para>
-
-<para> See the manual: <ulink url="man:/http">http</ulink>.
-</para>
-
-</article>
diff --git a/doc/tdeioslave/http/CMakeLists.txt b/doc/tdeioslave/http/CMakeLists.txt
new file mode 100644
index 000000000..0630a918e
--- /dev/null
+++ b/doc/tdeioslave/http/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/http )
diff --git a/doc/tdeioslave/http/Makefile.am b/doc/tdeioslave/http/Makefile.am
new file mode 100644
index 000000000..5657bf3ea
--- /dev/null
+++ b/doc/tdeioslave/http/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/http
diff --git a/doc/tdeioslave/http/index.docbook b/doc/tdeioslave/http/index.docbook
new file mode 100644
index 000000000..7184146d6
--- /dev/null
+++ b/doc/tdeioslave/http/index.docbook
@@ -0,0 +1,39 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY Ferdinand.Gassauer '<personname><firstname>Ferdinand</firstname><surname>Gassauer</surname></personname>'>
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
+<article lang="&language;" id="http">
+<title>http / https</title>
+<articleinfo>
+<authorgroup>
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+<author>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+<author>&tde-authors;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+</articleinfo>
+
+<para><acronym>http</acronym> is the
+<emphasis>H</emphasis>yper<emphasis>T</emphasis>ext
+<emphasis>T</emphasis>ransfer <emphasis>P</emphasis>rotocol.</para>
+
+<para>The http tdeioslave is used by all &tde; applications to handle
+connections to http servers, that is, web servers.  The most common
+usage is to view web pages in the &konqueror; web browser.</para>
+
+<para>You can use the http tdeioslave in &konqueror; by giving it a
+<acronym>URL</acronym>, such as <userinput>http://<replaceable>www.trinitydesktop.org</replaceable></userinput>.</para>
+
+<para> HTTPS is HTTP encapsulated in an SSL/TLS stream.</para>
+<para>SSL is the  Secure Sockets Layer protocol, a security protocol that
+provides communications privacy over the Internet. The protocol allows client/server
+applications to communicate in a way that is designed to prevent eavesdropping, tampering,
+or message forgery.</para>
+<para>TLS stands for Transport Layer Security</para>
+
+<para>Read the man page: <ulink url="man:/http">http</ulink>.</para>
+
+</article>
diff --git a/doc/tdeioslave/https.docbook b/doc/tdeioslave/https.docbook
deleted file mode 100644
index bbaa1b0a3..000000000
--- a/doc/tdeioslave/https.docbook
+++ /dev/null
@@ -1,21 +0,0 @@
-<article lang="&language;" id="https">
-<title>https</title>
-<articleinfo>
-<authorgroup>
-<author>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-</authorgroup>
-</articleinfo>
-<para>
-HTTPS is 
-<ulink url="help:/tdeioslave/http.html">HTTP</ulink>
- encapsulated in an SSL/TLS stream.
-</para>
-<para>
-SSL is the  Secure Sockets Layer  protocol, a security protocol that provides communications privacy over the Internet. The protocol allows client/server applications to communicate in a way that is designed to prevent eavesdropping, tampering, or message forgery. 
-</para>
-<para>
-TLS stands for Transport Layer Security
-</para>
-
-</article>
diff --git a/doc/tdeioslave/imap/CMakeLists.txt b/doc/tdeioslave/imap/CMakeLists.txt
new file mode 100644
index 000000000..87eabac9b
--- /dev/null
+++ b/doc/tdeioslave/imap/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/imap )
diff --git a/doc/tdeioslave/imap/Makefile.am b/doc/tdeioslave/imap/Makefile.am
new file mode 100644
index 000000000..e21d0f3de
--- /dev/null
+++ b/doc/tdeioslave/imap/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/imap
diff --git a/doc/tdeioslave/imap.docbook b/doc/tdeioslave/imap/index.docbook
similarity index 64%
rename from doc/tdeioslave/imap.docbook
rename to doc/tdeioslave/imap/index.docbook
index 8778877ce..19b753eef 100644
--- a/doc/tdeioslave/imap.docbook
+++ b/doc/tdeioslave/imap/index.docbook
@@ -1,17 +1,23 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="imap">
-<title>imap</title>
+<title>imap / imaps</title>
 <articleinfo>
 <authorgroup>
 <author>&Michael.Haeckel; &Michael.Haeckel.mail;</author>
+<author>&tde-authors;</author>
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 </authorgroup>
- 
+
 <date>2001-08-07</date>
 
- 
 </articleinfo>
 
-<para>The IMAP4rev1 protocol (Internet Message Access Protocol) allows
+<para>The IMAP4 (rev1) protocol (Internet Message Access Protocol) allows
 access to messages in mail folders on a server. Unlike POP3, which is designed
 to download the mails and delete them from the server, the purpose of IMAP is
 to store all mails on the server to be able to access these mails from
@@ -19,13 +25,15 @@ everywhere. Messages can be stored on the server, retrieved from there or
 moved between folders.</para>
 
 <para>This plugin is currently mainly used by KMail, but you can also use it
-in any other KDE application that uses tdeioslave plugins.</para>
+in other &tde; applications that use tdeioslave plugins.</para>
 
-<para>For example in &konqueror;, simply type
+<para>For example in &konqueror;, type
 <userinput>imap://username@your.mail.server/</userinput> to get your IMAP
 folders listed. You can then deal with the folders and mails like with folders
 and files on a local file system.
 IMAP URLs are defined in <ulink url="http://www.ietf.org/rfc/rfc2192.txt?number=2192">RFC 2192</ulink>.
 </para>
 
+<para>IMAPS is the IMAP protocol encrypted via SSL.</para>
+
 </article>
diff --git a/doc/tdeioslave/imaps.docbook b/doc/tdeioslave/imaps.docbook
deleted file mode 100644
index fc046944c..000000000
--- a/doc/tdeioslave/imaps.docbook
+++ /dev/null
@@ -1,17 +0,0 @@
-<article lang="&language;" id="imaps">
-<title>imaps</title>
-<articleinfo>
-<authorgroup>
-<author>&Michael.Haeckel; &Michael.Haeckel.mail;</author>
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-</authorgroup>
- 
-<date>2001-08-07</date>
- 
- 
-</articleinfo>
-
-<para>IMAPS is the <ulink url="help:/tdeioslave/imap.html">IMAP</ulink> protocol
-encrypted via SSL.</para>
-
-</article>
diff --git a/doc/tdeioslave/index.docbook b/doc/tdeioslave/index.docbook
deleted file mode 100644
index 6558dba6f..000000000
--- a/doc/tdeioslave/index.docbook
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE part PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" 
-"dtd/kdex.dtd" [
-<!ENTITY tdeio-bzip SYSTEM "bzip.docbook">
-<!ENTITY tdeio-bzip2 SYSTEM "bzip2.docbook">
-<!ENTITY tdeio-cgi SYSTEM "cgi.docbook">
-<!ENTITY tdeio-data SYSTEM "data.docbook">
-<!ENTITY tdeio-file SYSTEM "file.docbook">
-<!ENTITY tdeio-finger SYSTEM "finger.docbook">
-<!ENTITY tdeio-fish SYSTEM "fish.docbook">
-<!ENTITY tdeio-floppy SYSTEM "floppy.docbook">
-<!ENTITY tdeio-ftp SYSTEM "ftp.docbook">
-<!ENTITY tdeio-gopher SYSTEM "gopher.docbook">
-<!ENTITY tdeio-gzip SYSTEM "gzip.docbook">
-<!ENTITY tdeio-help SYSTEM "help.docbook">
-<!ENTITY tdeio-http SYSTEM "http.docbook">
-<!ENTITY tdeio-https SYSTEM "https.docbook">
-<!ENTITY tdeio-imap SYSTEM "imap.docbook">
-<!ENTITY tdeio-imaps SYSTEM "imaps.docbook">
-<!ENTITY tdeio-info SYSTEM "info.docbook">
-<!ENTITY tdeio-lan SYSTEM "lan.docbook">
-<!ENTITY tdeio-ldap SYSTEM "ldap.docbook">
-<!ENTITY tdeio-mailto SYSTEM "mailto.docbook">
-<!ENTITY tdeio-mac SYSTEM "mac.docbook">
-<!ENTITY tdeio-man SYSTEM "man.docbook">
-<!ENTITY tdeio-mrml SYSTEM "mrml.docbook"> <!-- post release, put this in the right module -->
-<!ENTITY tdeio-news SYSTEM "news.docbook">
-<!ENTITY tdeio-nfs SYSTEM "nfs.docbook">
-<!ENTITY tdeio-nntp SYSTEM "nntp.docbook">
-<!ENTITY tdeio-pop3 SYSTEM "pop3.docbook">
-<!ENTITY tdeio-pop3s SYSTEM "pop3s.docbook">
-<!ENTITY tdeio-print SYSTEM "print.docbook">
-<!ENTITY tdeio-rlan SYSTEM "rlan.docbook">
-<!ENTITY tdeio-rlogin SYSTEM "rlogin.docbook">
-<!ENTITY tdeio-sftp SYSTEM "sftp.docbook">
-<!ENTITY tdeio-smb SYSTEM "smb.docbook">
-<!ENTITY tdeio-smtp SYSTEM "smtp.docbook">
-<!ENTITY tdeio-tar SYSTEM "tar.docbook">
-<!ENTITY tdeio-telnet SYSTEM "telnet.docbook">
-<!ENTITY tdeio-thumbnail SYSTEM "thumbnail.docbook">
-<!ENTITY tdeio-webdav SYSTEM "webdav.docbook">
-<!ENTITY tdeio-webdavs SYSTEM "webdavs.docbook">
-<!ENTITY tdeprint "<application>TDEPrint</application>">
-<!ENTITY Ferdinand.Gassauer '<personname><firstname>Ferdinand</firstname><surname>Gassauer</surname></personname>'>
-<!ENTITY Ferdinand.Gassauer.mail '<email>f.gassauer@aon.at</email>'>
-<!ENTITY % addindex "IGNORE">
-<!ENTITY % English "INCLUDE" > <!-- change language only here -->
-]>
-
-<part lang="&language;">
-<title>IO-Slaves</title>
-&tdeio-bzip;
-&tdeio-bzip2;
-&tdeio-cgi;
-&tdeio-data;
-&tdeio-file;
-&tdeio-finger;
-&tdeio-fish;
-&tdeio-floppy;
-&tdeio-ftp;
-&tdeio-gopher;
-&tdeio-gzip;
-&tdeio-help;
-&tdeio-http;
-&tdeio-https;
-&tdeio-imap;
-&tdeio-imaps;
-&tdeio-info;
-&tdeio-lan;
-&tdeio-ldap;
-&tdeio-mailto;
-&tdeio-mac;
-&tdeio-man;
-&tdeio-mrml;
-&tdeio-news;
-&tdeio-nfs;
-&tdeio-nntp;
-&tdeio-pop3;
-&tdeio-pop3s;
-&tdeio-print;
-&tdeio-rlan;
-&tdeio-rlogin;
-&tdeio-sftp;
-&tdeio-smb;
-&tdeio-smtp;
-&tdeio-tar;
-&tdeio-telnet;
-&tdeio-thumbnail;
-&tdeio-webdav;
-&tdeio-webdavs;
-
-</part>
-
diff --git a/doc/tdeioslave/info/CMakeLists.txt b/doc/tdeioslave/info/CMakeLists.txt
new file mode 100644
index 000000000..8dacd3add
--- /dev/null
+++ b/doc/tdeioslave/info/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/info )
diff --git a/doc/tdeioslave/info/Makefile.am b/doc/tdeioslave/info/Makefile.am
new file mode 100644
index 000000000..fc09b998e
--- /dev/null
+++ b/doc/tdeioslave/info/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/info
diff --git a/doc/tdeioslave/info.docbook b/doc/tdeioslave/info/index.docbook
similarity index 84%
rename from doc/tdeioslave/info.docbook
rename to doc/tdeioslave/info/index.docbook
index 1ea645c33..c0ba13ea9 100644
--- a/doc/tdeioslave/info.docbook
+++ b/doc/tdeioslave/info/index.docbook
@@ -1,3 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="info">
 <title>Info</title>
 <articleinfo>
diff --git a/doc/tdeioslave/lan/CMakeLists.txt b/doc/tdeioslave/lan/CMakeLists.txt
new file mode 100644
index 000000000..fe520e0e9
--- /dev/null
+++ b/doc/tdeioslave/lan/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/lan )
diff --git a/doc/tdeioslave/lan/Makefile.am b/doc/tdeioslave/lan/Makefile.am
new file mode 100644
index 000000000..cdd303dea
--- /dev/null
+++ b/doc/tdeioslave/lan/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/lan
diff --git a/doc/tdeioslave/lan.docbook b/doc/tdeioslave/lan/index.docbook
similarity index 70%
rename from doc/tdeioslave/lan.docbook
rename to doc/tdeioslave/lan/index.docbook
index ad75ce385..360c803bc 100644
--- a/doc/tdeioslave/lan.docbook
+++ b/doc/tdeioslave/lan/index.docbook
@@ -1,3 +1,10 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY Ferdinand.Gassauer '<personname><firstname>Ferdinand</firstname><surname>Gassauer</surname></personname>'>
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="lan">
 <title>lan</title>
 <articleinfo>
diff --git a/doc/tdeioslave/ldap/CMakeLists.txt b/doc/tdeioslave/ldap/CMakeLists.txt
new file mode 100644
index 000000000..abbea12ba
--- /dev/null
+++ b/doc/tdeioslave/ldap/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/ldap )
diff --git a/doc/tdeioslave/ldap/Makefile.am b/doc/tdeioslave/ldap/Makefile.am
new file mode 100644
index 000000000..77444dfa8
--- /dev/null
+++ b/doc/tdeioslave/ldap/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/ldap
diff --git a/doc/tdeioslave/ldap.docbook b/doc/tdeioslave/ldap/index.docbook
similarity index 65%
rename from doc/tdeioslave/ldap.docbook
rename to doc/tdeioslave/ldap/index.docbook
index 48515751d..1149a5f8b 100644
--- a/doc/tdeioslave/ldap.docbook
+++ b/doc/tdeioslave/ldap/index.docbook
@@ -1,8 +1,15 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="ldap">
-<title>ldap</title>
+<title>ldap / ldaps</title>
 <articleinfo>
 <authorgroup>
 <author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+<author>&tde-authors;</author>
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 </authorgroup>
 </articleinfo>
@@ -20,4 +27,6 @@ for a subtree-query</para>
 <userinput>ldap://host:port/cn=MM,ou=People,o=where,c=de??base</userinput>
 for a complete branch.</para>
 
+<para>LDAPS is the LDAP protocol encrypted via SSL.</para>
+
 </article>
diff --git a/doc/tdeioslave/mac/CMakeLists.txt b/doc/tdeioslave/mac/CMakeLists.txt
new file mode 100644
index 000000000..7f2050fa1
--- /dev/null
+++ b/doc/tdeioslave/mac/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/mac )
diff --git a/doc/tdeioslave/mac/Makefile.am b/doc/tdeioslave/mac/Makefile.am
new file mode 100644
index 000000000..45904fa63
--- /dev/null
+++ b/doc/tdeioslave/mac/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/mac
diff --git a/doc/tdeioslave/mac.docbook b/doc/tdeioslave/mac/index.docbook
similarity index 91%
rename from doc/tdeioslave/mac.docbook
rename to doc/tdeioslave/mac/index.docbook
index 5c9f2a79f..7c4cf99c8 100644
--- a/doc/tdeioslave/mac.docbook
+++ b/doc/tdeioslave/mac/index.docbook
@@ -1,3 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="mac">
 <title>mac</title>
 <articleinfo>
diff --git a/doc/tdeioslave/mailto/CMakeLists.txt b/doc/tdeioslave/mailto/CMakeLists.txt
new file mode 100644
index 000000000..bf0053523
--- /dev/null
+++ b/doc/tdeioslave/mailto/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/mailto )
diff --git a/doc/tdeioslave/mailto/Makefile.am b/doc/tdeioslave/mailto/Makefile.am
new file mode 100644
index 000000000..66c5a87d7
--- /dev/null
+++ b/doc/tdeioslave/mailto/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/mailto
diff --git a/doc/tdeioslave/mailto.docbook b/doc/tdeioslave/mailto/index.docbook
similarity index 63%
rename from doc/tdeioslave/mailto.docbook
rename to doc/tdeioslave/mailto/index.docbook
index ac7fddd46..d83105fb9 100644
--- a/doc/tdeioslave/mailto.docbook
+++ b/doc/tdeioslave/mailto/index.docbook
@@ -1,3 +1,10 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY Ferdinand.Gassauer '<personname><firstname>Ferdinand</firstname><surname>Gassauer</surname></personname>'>
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="mailto">
 <title>mailto</title>
 <articleinfo>
diff --git a/doc/tdeioslave/man/CMakeLists.txt b/doc/tdeioslave/man/CMakeLists.txt
new file mode 100644
index 000000000..4bdfa76b1
--- /dev/null
+++ b/doc/tdeioslave/man/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/man )
diff --git a/doc/tdeioslave/man/Makefile.am b/doc/tdeioslave/man/Makefile.am
new file mode 100644
index 000000000..a74f9d7a3
--- /dev/null
+++ b/doc/tdeioslave/man/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/man
diff --git a/doc/tdeioslave/man.docbook b/doc/tdeioslave/man/index.docbook
similarity index 91%
rename from doc/tdeioslave/man.docbook
rename to doc/tdeioslave/man/index.docbook
index 8f3324ff1..8fef2a88b 100644
--- a/doc/tdeioslave/man.docbook
+++ b/doc/tdeioslave/man/index.docbook
@@ -1,3 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="man">
 <title>Man</title>
 <articleinfo>
diff --git a/doc/tdeioslave/mrml/CMakeLists.txt b/doc/tdeioslave/mrml/CMakeLists.txt
new file mode 100644
index 000000000..a30aba1c7
--- /dev/null
+++ b/doc/tdeioslave/mrml/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/mrml )
diff --git a/doc/tdeioslave/mrml/Makefile.am b/doc/tdeioslave/mrml/Makefile.am
new file mode 100644
index 000000000..a7c94fd06
--- /dev/null
+++ b/doc/tdeioslave/mrml/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/mrml
diff --git a/doc/tdeioslave/mrml.docbook b/doc/tdeioslave/mrml/index.docbook
similarity index 77%
rename from doc/tdeioslave/mrml.docbook
rename to doc/tdeioslave/mrml/index.docbook
index ecfd8a119..890f18db9 100644
--- a/doc/tdeioslave/mrml.docbook
+++ b/doc/tdeioslave/mrml/index.docbook
@@ -1,3 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="mrml">
 <title>mrml</title>
 <articleinfo>
diff --git a/doc/tdeioslave/news/CMakeLists.txt b/doc/tdeioslave/news/CMakeLists.txt
new file mode 100644
index 000000000..781563299
--- /dev/null
+++ b/doc/tdeioslave/news/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/news )
diff --git a/doc/tdeioslave/news/Makefile.am b/doc/tdeioslave/news/Makefile.am
new file mode 100644
index 000000000..9d526a265
--- /dev/null
+++ b/doc/tdeioslave/news/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/news
diff --git a/doc/tdeioslave/news.docbook b/doc/tdeioslave/news/index.docbook
similarity index 76%
rename from doc/tdeioslave/news.docbook
rename to doc/tdeioslave/news/index.docbook
index d13f2b715..ac356382f 100644
--- a/doc/tdeioslave/news.docbook
+++ b/doc/tdeioslave/news/index.docbook
@@ -1,3 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="news">
 <title>news</title>
 <articleinfo>
diff --git a/doc/tdeioslave/nfs/CMakeLists.txt b/doc/tdeioslave/nfs/CMakeLists.txt
new file mode 100644
index 000000000..f73b233b4
--- /dev/null
+++ b/doc/tdeioslave/nfs/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/nfs )
diff --git a/doc/tdeioslave/nfs/Makefile.am b/doc/tdeioslave/nfs/Makefile.am
new file mode 100644
index 000000000..01ceb61fa
--- /dev/null
+++ b/doc/tdeioslave/nfs/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/nfs
diff --git a/doc/tdeioslave/nfs.docbook b/doc/tdeioslave/nfs/index.docbook
similarity index 86%
rename from doc/tdeioslave/nfs.docbook
rename to doc/tdeioslave/nfs/index.docbook
index bbe9bb625..3c97237ab 100644
--- a/doc/tdeioslave/nfs.docbook
+++ b/doc/tdeioslave/nfs/index.docbook
@@ -1,3 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="nfs">
 <title>nfs</title>
 <articleinfo>
diff --git a/doc/tdeioslave/nntp/CMakeLists.txt b/doc/tdeioslave/nntp/CMakeLists.txt
new file mode 100644
index 000000000..084ca0732
--- /dev/null
+++ b/doc/tdeioslave/nntp/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/nntp )
diff --git a/doc/tdeioslave/nntp/Makefile.am b/doc/tdeioslave/nntp/Makefile.am
new file mode 100644
index 000000000..3b0f1cd90
--- /dev/null
+++ b/doc/tdeioslave/nntp/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/nntp
diff --git a/doc/tdeioslave/nntp.docbook b/doc/tdeioslave/nntp/index.docbook
similarity index 88%
rename from doc/tdeioslave/nntp.docbook
rename to doc/tdeioslave/nntp/index.docbook
index 20de8e952..dbb2becb5 100644
--- a/doc/tdeioslave/nntp.docbook
+++ b/doc/tdeioslave/nntp/index.docbook
@@ -1,3 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="nntp">
 <title>nntp</title>
 <articleinfo>
diff --git a/doc/tdeioslave/pop3.docbook b/doc/tdeioslave/pop3.docbook
deleted file mode 100644
index 1c956a1cd..000000000
--- a/doc/tdeioslave/pop3.docbook
+++ /dev/null
@@ -1,13 +0,0 @@
-<article lang="&language;" id="pop3">
-<title>pop3</title>
-<articleinfo>
-<authorgroup>
-<author>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-</authorgroup>
-</articleinfo>
-<para>
-The Post Office Protocol (POP3) allows a user's workstation to access mail from a mailbox server.
-</para>
-
-</article>
diff --git a/doc/tdeioslave/pop3/CMakeLists.txt b/doc/tdeioslave/pop3/CMakeLists.txt
new file mode 100644
index 000000000..447e52d51
--- /dev/null
+++ b/doc/tdeioslave/pop3/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/pop3 )
diff --git a/doc/tdeioslave/pop3/Makefile.am b/doc/tdeioslave/pop3/Makefile.am
new file mode 100644
index 000000000..5348a0231
--- /dev/null
+++ b/doc/tdeioslave/pop3/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/pop3
diff --git a/doc/tdeioslave/pop3/index.docbook b/doc/tdeioslave/pop3/index.docbook
new file mode 100644
index 000000000..380a3df0b
--- /dev/null
+++ b/doc/tdeioslave/pop3/index.docbook
@@ -0,0 +1,25 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY Ferdinand.Gassauer '<personname><firstname>Ferdinand</firstname><surname>Gassauer</surname></personname>'>
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
+<article lang="&language;" id="pop3">
+<title>pop3 / pop3s</title>
+<articleinfo>
+<authorgroup>
+<author>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+<author>&tde-authors;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+</articleinfo>
+
+<para>
+The Post Office Protocol (POP3) allows a user's workstation to access mail from a mailbox server.
+</para>
+
+<para>POP3S is the POP3 protocol encrypted via SSL.</para>
+
+
+</article>
diff --git a/doc/tdeioslave/pop3s.docbook b/doc/tdeioslave/pop3s.docbook
deleted file mode 100644
index 856709e80..000000000
--- a/doc/tdeioslave/pop3s.docbook
+++ /dev/null
@@ -1,14 +0,0 @@
-<article lang="&language;" id="pop3s">
-<title>pop3s</title>
-<articleinfo>
-<authorgroup>
-<author>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-</authorgroup>
-</articleinfo>
-<para>
-POP3S is the POP3 protocol encrypted via SSL.
-
-</para>
-
-</article>
diff --git a/doc/tdeioslave/print/CMakeLists.txt b/doc/tdeioslave/print/CMakeLists.txt
new file mode 100644
index 000000000..7ebc5b392
--- /dev/null
+++ b/doc/tdeioslave/print/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/print )
diff --git a/doc/tdeioslave/print/Makefile.am b/doc/tdeioslave/print/Makefile.am
new file mode 100644
index 000000000..00fc813d6
--- /dev/null
+++ b/doc/tdeioslave/print/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/print
diff --git a/doc/tdeioslave/print.docbook b/doc/tdeioslave/print/index.docbook
similarity index 96%
rename from doc/tdeioslave/print.docbook
rename to doc/tdeioslave/print/index.docbook
index fa102c3af..872b3714c 100644
--- a/doc/tdeioslave/print.docbook
+++ b/doc/tdeioslave/print/index.docbook
@@ -1,3 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="print">
 <title>print</title>
 <articleinfo>
diff --git a/doc/tdeioslave/rlan.docbook b/doc/tdeioslave/rlan.docbook
deleted file mode 100644
index b0d358aa0..000000000
--- a/doc/tdeioslave/rlan.docbook
+++ /dev/null
@@ -1,11 +0,0 @@
-<article lang="&language;" id="rlan">
-<title>rlan</title>
-<articleinfo>
-<authorgroup>
-<corpauthor>The &tde; team</corpauthor>
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-</authorgroup>
-</articleinfo>
-<para>Not yet documented</para>
-
-</article>
diff --git a/doc/tdeioslave/rlogin/CMakeLists.txt b/doc/tdeioslave/rlogin/CMakeLists.txt
new file mode 100644
index 000000000..2a19348a6
--- /dev/null
+++ b/doc/tdeioslave/rlogin/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/rlogin )
diff --git a/doc/tdeioslave/rlogin/Makefile.am b/doc/tdeioslave/rlogin/Makefile.am
new file mode 100644
index 000000000..44751e92f
--- /dev/null
+++ b/doc/tdeioslave/rlogin/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/rlogin
diff --git a/doc/tdeioslave/rlogin.docbook b/doc/tdeioslave/rlogin/index.docbook
similarity index 82%
rename from doc/tdeioslave/rlogin.docbook
rename to doc/tdeioslave/rlogin/index.docbook
index 54e834e9f..59c448feb 100644
--- a/doc/tdeioslave/rlogin.docbook
+++ b/doc/tdeioslave/rlogin/index.docbook
@@ -1,3 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="rlogin">
 <title>rlogin</title>
 <articleinfo>
diff --git a/doc/tdeioslave/sftp/CMakeLists.txt b/doc/tdeioslave/sftp/CMakeLists.txt
new file mode 100644
index 000000000..a02ff4efd
--- /dev/null
+++ b/doc/tdeioslave/sftp/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/sftp )
diff --git a/doc/tdeioslave/sftp/Makefile.am b/doc/tdeioslave/sftp/Makefile.am
new file mode 100644
index 000000000..7ff5ffd40
--- /dev/null
+++ b/doc/tdeioslave/sftp/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/sftp
diff --git a/doc/tdeioslave/sftp.docbook b/doc/tdeioslave/sftp/index.docbook
similarity index 65%
rename from doc/tdeioslave/sftp.docbook
rename to doc/tdeioslave/sftp/index.docbook
index ff2770a47..228d43808 100644
--- a/doc/tdeioslave/sftp.docbook
+++ b/doc/tdeioslave/sftp/index.docbook
@@ -1,3 +1,10 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY Ferdinand.Gassauer '<personname><firstname>Ferdinand</firstname><surname>Gassauer</surname></personname>'>
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="sftp">
 <title>sftp</title>
 <articleinfo>
diff --git a/doc/tdeioslave/smb/CMakeLists.txt b/doc/tdeioslave/smb/CMakeLists.txt
new file mode 100644
index 000000000..cb27bbf45
--- /dev/null
+++ b/doc/tdeioslave/smb/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/smb )
diff --git a/doc/tdeioslave/smb/Makefile.am b/doc/tdeioslave/smb/Makefile.am
new file mode 100644
index 000000000..11b1b83c4
--- /dev/null
+++ b/doc/tdeioslave/smb/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/smb
diff --git a/doc/tdeioslave/smb.docbook b/doc/tdeioslave/smb/index.docbook
similarity index 89%
rename from doc/tdeioslave/smb.docbook
rename to doc/tdeioslave/smb/index.docbook
index ef7e9ac98..e3bca3f70 100644
--- a/doc/tdeioslave/smb.docbook
+++ b/doc/tdeioslave/smb/index.docbook
@@ -1,3 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="smb">
 <title>SMB</title>
 <articleinfo>
diff --git a/doc/tdeioslave/smtp/CMakeLists.txt b/doc/tdeioslave/smtp/CMakeLists.txt
new file mode 100644
index 000000000..dd134a13e
--- /dev/null
+++ b/doc/tdeioslave/smtp/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/smtp )
diff --git a/doc/tdeioslave/smtp/Makefile.am b/doc/tdeioslave/smtp/Makefile.am
new file mode 100644
index 000000000..e98036c1a
--- /dev/null
+++ b/doc/tdeioslave/smtp/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/smtp
diff --git a/doc/tdeioslave/smtp.docbook b/doc/tdeioslave/smtp/index.docbook
similarity index 54%
rename from doc/tdeioslave/smtp.docbook
rename to doc/tdeioslave/smtp/index.docbook
index 2aa2c7dbf..1b8a31cbb 100644
--- a/doc/tdeioslave/smtp.docbook
+++ b/doc/tdeioslave/smtp/index.docbook
@@ -1,3 +1,10 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY Ferdinand.Gassauer '<personname><firstname>Ferdinand</firstname><surname>Gassauer</surname></personname>'>
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="smtp">
 <title>smtp</title>
 <articleinfo>
diff --git a/doc/tdeioslave/tar/CMakeLists.txt b/doc/tdeioslave/tar/CMakeLists.txt
new file mode 100644
index 000000000..8fa354c76
--- /dev/null
+++ b/doc/tdeioslave/tar/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/tar )
diff --git a/doc/tdeioslave/tar/Makefile.am b/doc/tdeioslave/tar/Makefile.am
new file mode 100644
index 000000000..e2b4850e4
--- /dev/null
+++ b/doc/tdeioslave/tar/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/tar
diff --git a/doc/tdeioslave/tar.docbook b/doc/tdeioslave/tar/index.docbook
similarity index 59%
rename from doc/tdeioslave/tar.docbook
rename to doc/tdeioslave/tar/index.docbook
index 8a5405198..e785eb051 100644
--- a/doc/tdeioslave/tar.docbook
+++ b/doc/tdeioslave/tar/index.docbook
@@ -1,3 +1,10 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY Ferdinand.Gassauer '<personname><firstname>Ferdinand</firstname><surname>Gassauer</surname></personname>'>
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="tar">
 <title>tar</title>
 <articleinfo>
diff --git a/doc/tdeioslave/telnet/CMakeLists.txt b/doc/tdeioslave/telnet/CMakeLists.txt
new file mode 100644
index 000000000..e2b411f0e
--- /dev/null
+++ b/doc/tdeioslave/telnet/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/telnet )
diff --git a/doc/tdeioslave/telnet/Makefile.am b/doc/tdeioslave/telnet/Makefile.am
new file mode 100644
index 000000000..a8f7937a9
--- /dev/null
+++ b/doc/tdeioslave/telnet/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/telnet
diff --git a/doc/tdeioslave/telnet.docbook b/doc/tdeioslave/telnet/index.docbook
similarity index 56%
rename from doc/tdeioslave/telnet.docbook
rename to doc/tdeioslave/telnet/index.docbook
index 9d2131e84..f1326244c 100644
--- a/doc/tdeioslave/telnet.docbook
+++ b/doc/tdeioslave/telnet/index.docbook
@@ -1,3 +1,10 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY Ferdinand.Gassauer '<personname><firstname>Ferdinand</firstname><surname>Gassauer</surname></personname>'>
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="telnet">
 <title>telnet</title>
 <articleinfo>
diff --git a/doc/tdeioslave/thumbnail/CMakeLists.txt b/doc/tdeioslave/thumbnail/CMakeLists.txt
new file mode 100644
index 000000000..0edab25bd
--- /dev/null
+++ b/doc/tdeioslave/thumbnail/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/thumbnail )
diff --git a/doc/tdeioslave/thumbnail/Makefile.am b/doc/tdeioslave/thumbnail/Makefile.am
new file mode 100644
index 000000000..adf70192f
--- /dev/null
+++ b/doc/tdeioslave/thumbnail/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/thumbnail
diff --git a/doc/tdeioslave/thumbnail.docbook b/doc/tdeioslave/thumbnail/index.docbook
similarity index 82%
rename from doc/tdeioslave/thumbnail.docbook
rename to doc/tdeioslave/thumbnail/index.docbook
index fb07fe5ac..72b12c93b 100644
--- a/doc/tdeioslave/thumbnail.docbook
+++ b/doc/tdeioslave/thumbnail/index.docbook
@@ -1,3 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="thumbnail">
 <title>thumbnail</title>
 <articleinfo>
diff --git a/doc/tdeioslave/webdav/CMakeLists.txt b/doc/tdeioslave/webdav/CMakeLists.txt
new file mode 100644
index 000000000..f1613fed7
--- /dev/null
+++ b/doc/tdeioslave/webdav/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/webdav )
diff --git a/doc/tdeioslave/webdav/Makefile.am b/doc/tdeioslave/webdav/Makefile.am
new file mode 100644
index 000000000..aa9d8a089
--- /dev/null
+++ b/doc/tdeioslave/webdav/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/webdav
diff --git a/doc/tdeioslave/webdav.docbook b/doc/tdeioslave/webdav/index.docbook
similarity index 69%
rename from doc/tdeioslave/webdav.docbook
rename to doc/tdeioslave/webdav/index.docbook
index 8f46546b0..79f3c3973 100644
--- a/doc/tdeioslave/webdav.docbook
+++ b/doc/tdeioslave/webdav/index.docbook
@@ -1,12 +1,19 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
 <article lang="&language;" id="webdav">
-<title>webdav</title>
+<title>webdav / webdavs</title>
+
 <articleinfo>
 <authorgroup>
-<author>&Hamish.Rodda; &Hamish.Rodda.mail;</author>
+<author>&Hamish.Rodda;</author>
+<author>&tde-authors;</author>
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 </authorgroup>
 
-<date>2002-01-21</date>
 </articleinfo>
 
 <para><acronym>WebDAV</acronym> is a <emphasis>D</emphasis>istributed
@@ -30,36 +37,32 @@ would with any other filesystem.</para>
 <varlistentry>
 <term>Locking</term>
 <listitem>
-<para>File locking allows users to lock a file, informing others that they 
-are
-currently working on this file. This way, editing can be done without fear 
-that
-the changes may be overwritten by another person who is also editing the 
-same
-document.</para>
+<para>File locking allows users to lock a file, informing others that they
+are currently working on this file. This way, editing can be done without fear
+that the changes may be overwritten by another person who is also editing the
+same document.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>Source file access</term>
 <listitem>
-<para><acronym>WebDAV</acronym> allows access to the script which is called 
-to
-produce a specific page, so changes can be made to the script itself.</para>
+<para><acronym>WebDAV</acronym> allows access to the script which is called
+to produce a specific page, so changes can be made to the script itself.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>Per-document property support</term>
 <listitem>
 <para>Arbitrary properties may be set to assist identification of a 
-document,
-such as the author.</para>
+document, such as the author.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
 <para>To take advantage of these additional capabilities, you will need an
 application which supports them. No application currently supports them 
-through
-this tdeioslave.</para>
+through this tdeioslave.</para>
+
+<para>WebDAVS is the WebDAV protocol encrypted via SSL.</para>
 
 </article>
diff --git a/doc/tdeioslave/webdavs.docbook b/doc/tdeioslave/webdavs.docbook
deleted file mode 100644
index 23dde138c..000000000
--- a/doc/tdeioslave/webdavs.docbook
+++ /dev/null
@@ -1,17 +0,0 @@
-<article lang="&language;" id="webdavs">
-<title>webdavs</title>
-<articleinfo>
-<authorgroup>
-<author>&Hamish.Rodda; &Hamish.Rodda.mail;</author>
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-</authorgroup>
-
-<date>2002-01-21</date>
-
-
-</articleinfo>
-
-<para>WebDAVS is the <ulink url="help:/tdeioslave/webdav.html">WebDAV</ulink> protocol
-encrypted via SSL.</para>
-
-</article>
diff --git a/doc/tdeioslave/xz/CMakeLists.txt b/doc/tdeioslave/xz/CMakeLists.txt
new file mode 100644
index 000000000..505b8d597
--- /dev/null
+++ b/doc/tdeioslave/xz/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/xz )
diff --git a/doc/tdeioslave/xz/Makefile.am b/doc/tdeioslave/xz/Makefile.am
new file mode 100644
index 000000000..b466bd505
--- /dev/null
+++ b/doc/tdeioslave/xz/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/xz
diff --git a/doc/tdeioslave/xz/index.docbook b/doc/tdeioslave/xz/index.docbook
new file mode 100644
index 000000000..74b5b0cd8
--- /dev/null
+++ b/doc/tdeioslave/xz/index.docbook
@@ -0,0 +1,34 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
+<article lang="&language;" id="xz">
+<title>xz / lzma</title>
+
+<articleinfo>
+<authorgroup>
+<author><firstname>Per Øyvind</firstname><surname> Karlsen</surname></author>
+<author>&tde-authors;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+</articleinfo>
+
+<para>Xz is a compression program</para>
+
+<para>The xz slave is not directly usable and is intended for use
+as a filter. For example, the tar slave can filter a file through
+the xz slave, in order to display the contents of a <literal
+role="extension">tar.lzma</literal> or <literal role="extension">tar.xz</literal>
+file directly in a &konqueror; window.</para>
+
+<para>If you click on a file compressed with a <literal
+role="extension">.lzma</literal> or <literal role="extension">tar.xz</literal>
+in &konqueror;, this slave is used to
+uncompress it and display it as a normal (uncompressed) file.</para>
+
+<para>Read the man page: <ulink url="man:/xz">xz</ulink>.</para>
+
+</article>
diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
index b64d5a4d2..e1cdc10d2 100644
--- a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
+++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
@@ -118,7 +118,7 @@ void KCMIOSlaveInfo::slotResult(TDEIO::Job *)
 
 void KCMIOSlaveInfo::showInfo(const TQString& protocol)
 {
-   TQString file = TQString("tdeioslave/%1.docbook").arg( protocol );
+   TQString file = TQString("tdeioslave/%1/index.docbook").arg( protocol );
    file = TDEGlobal::locale()->langLookup( file );
    if (m_tfj)
    {
@@ -129,12 +129,23 @@ void KCMIOSlaveInfo::showInfo(const TQString& protocol)
    if (!file.isEmpty())
    {
        helpData.truncate( 0 );
-       m_tfj = TDEIO::get( KURL( TQString("help:/tdeioslave/%1.html").arg( protocol ) ), true, false );
+       m_tfj = TDEIO::get( KURL( TQString("help:/tdeioslave/%1/index.html").arg( protocol ) ), true, false );
        connect( m_tfj, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( slaveHelp( TDEIO::Job *, const TQByteArray &) ) );
        connect( m_tfj, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotResult( TDEIO::Job * ) ) );
        return;
    }
-   m_info->setText(i18n("Some info about protocol %1:/ ...").arg(protocol));
+   else if (file.isEmpty())
+   {
+       helpData.truncate( 0 );
+       m_tfj = TDEIO::get( KURL( TQString("help:/khelpcenter/helpnotfound/index.html").arg( protocol ) ), true, false );
+       connect( m_tfj, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( slaveHelp( TDEIO::Job *, const TQByteArray &) ) );
+       connect( m_tfj, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+       return;
+   }
+   else
+   {
+       m_info->setText(i18n("There is no documentation available for %1:/ ...").arg(protocol));
+   }
 }
 
 void KCMIOSlaveInfo::showInfo(TQListBoxItem *item)
diff --git a/tdeioslave/cgi/cgi.protocol b/tdeioslave/cgi/cgi.protocol
index 24910f731..585c22659 100644
--- a/tdeioslave/cgi/cgi.protocol
+++ b/tdeioslave/cgi/cgi.protocol
@@ -4,5 +4,5 @@ protocol=cgi
 input=none
 output=filesystem
 reading=true
-DocPath=tdeioslave/cgi.html
+DocPath=tdeioslave/cgi/index.html
 Icon=html
diff --git a/tdeioslave/filter/bzip.protocol b/tdeioslave/filter/bzip.protocol
index 46d74ca33..91e7c67b0 100644
--- a/tdeioslave/filter/bzip.protocol
+++ b/tdeioslave/filter/bzip.protocol
@@ -6,5 +6,5 @@ input=stream
 output=stream
 reading=true
 source=false
-DocPath=tdeioslave/bzip.html
+DocPath=tdeioslave/bzip/index.html
 Icon=ark
diff --git a/tdeioslave/filter/bzip2.protocol b/tdeioslave/filter/bzip2.protocol
index 7d0d66fcf..b8ff0fc01 100644
--- a/tdeioslave/filter/bzip2.protocol
+++ b/tdeioslave/filter/bzip2.protocol
@@ -6,5 +6,5 @@ input=stream
 output=stream
 reading=true
 source=false
-DocPath=tdeioslave/bzip2.html
+DocPath=tdeioslave/bzip2/index.html
 Icon=ark
diff --git a/tdeioslave/filter/gzip.protocol b/tdeioslave/filter/gzip.protocol
index 01aee5b5d..9c85fa437 100644
--- a/tdeioslave/filter/gzip.protocol
+++ b/tdeioslave/filter/gzip.protocol
@@ -6,5 +6,5 @@ input=stream
 output=stream
 reading=true
 source=false
-DocPath=tdeioslave/gzip.html
+DocPath=tdeioslave/gzip/index.html
 Icon=ark
diff --git a/tdeioslave/filter/lzma.protocol b/tdeioslave/filter/lzma.protocol
index 15c255286..7d3147347 100644
--- a/tdeioslave/filter/lzma.protocol
+++ b/tdeioslave/filter/lzma.protocol
@@ -6,5 +6,5 @@ input=stream
 output=stream
 reading=true
 source=false
-DocPath=tdeioslave/lzma.html
+DocPath=tdeioslave/xz/index.html
 Icon=ark
diff --git a/tdeioslave/filter/xz.protocol b/tdeioslave/filter/xz.protocol
index e8a83b56f..eb20ea026 100644
--- a/tdeioslave/filter/xz.protocol
+++ b/tdeioslave/filter/xz.protocol
@@ -6,5 +6,5 @@ input=stream
 output=stream
 reading=true
 source=false
-DocPath=tdeioslave/xz.html
+DocPath=tdeioslave/xz/index.html
 Icon=ark
diff --git a/tdeioslave/finger/finger.protocol b/tdeioslave/finger/finger.protocol
index 59bfec017..877b10cda 100644
--- a/tdeioslave/finger/finger.protocol
+++ b/tdeioslave/finger/finger.protocol
@@ -5,5 +5,5 @@ input=none
 output=stream
 reading=true
 defaultMimetype=text/html
-DocPath=tdeioslave/finger.html
+DocPath=tdeioslave/finger/index.html
 Icon=tdmconfig
diff --git a/tdeioslave/fish/fish.protocol b/tdeioslave/fish/fish.protocol
index e4ab09d56..a68a40be8 100644
--- a/tdeioslave/fish/fish.protocol
+++ b/tdeioslave/fish/fish.protocol
@@ -78,4 +78,4 @@ Description[vi]=A tdeioslave (đày tớ vào ra KDE) cho giao thức FISH
 Description[wa]=On tdeioslave pol protocole FISH
 Description[zh_CN]=FISH 协议的 TDEIO 仆人
 Description[zh_TW]=用於 FISH 通訊協定的 tdeioslave
-DocPath=tdeioslave/fish.html
+DocPath=tdeioslave/fish/index.html
diff --git a/tdeioslave/fish/nxfish.protocol b/tdeioslave/fish/nxfish.protocol
index 38a100cfb..e81172399 100644
--- a/tdeioslave/fish/nxfish.protocol
+++ b/tdeioslave/fish/nxfish.protocol
@@ -71,4 +71,4 @@ Description[vi]=A tdeioslave (đày tớ vào ra KDE) cho giao thức NXFISH
 Description[wa]=On tdeioslave pol protocole NXFISH
 Description[zh_CN]=NXFISH 协议的 TDEIO 仆人
 Description[zh_TW]=用於 NXFISH 通訊協定的 tdeioslave
-DocPath=tdeioslave/fish.html
+DocPath=tdeioslave/nxfish/index.html
diff --git a/tdeioslave/floppy/floppy.protocol b/tdeioslave/floppy/floppy.protocol
index 84a1b12b8..b9b61c6aa 100644
--- a/tdeioslave/floppy/floppy.protocol
+++ b/tdeioslave/floppy/floppy.protocol
@@ -10,5 +10,5 @@ makedir=true
 deleting=true
 moving=true
 Icon=3floppy_mount
-DocPath=tdeioslave/floppy.html
+DocPath=tdeioslave/floppy/index.html
 Class=:local
diff --git a/tdeioslave/home/home.protocol b/tdeioslave/home/home.protocol
index 53192efe0..758ecf52c 100644
--- a/tdeioslave/home/home.protocol
+++ b/tdeioslave/home/home.protocol
@@ -12,7 +12,7 @@ linking=true
 moving=true
 Icon=folder_home
 maxInstances=4
-#TODO DocPath=tdeioslave/file.html
+#TODO DocPath=tdeioslave/home/index.html
 Class=:local
 Parent=system:/
 deleteRecursive=true
diff --git a/tdeioslave/info/info.protocol b/tdeioslave/info/info.protocol
index fc8db0dfa..e8d8c048b 100644
--- a/tdeioslave/info/info.protocol
+++ b/tdeioslave/info/info.protocol
@@ -6,6 +6,6 @@ output=filesystem
 reading=true
 defaultMimetype=text/html
 determineMimetypeFromExtension=false
-DocPath=tdeioslave/info.html
+DocPath=tdeioslave/info/index.html
 Icon=help_index
 Class=:local
diff --git a/tdeioslave/ldap/ldap.protocol b/tdeioslave/ldap/ldap.protocol
index 3082c6cb7..ae7241b98 100644
--- a/tdeioslave/ldap/ldap.protocol
+++ b/tdeioslave/ldap/ldap.protocol
@@ -13,5 +13,5 @@ deleting=true
 #moving=true
 mimetype=text/plain
 determineMimetypeFromExtension=false
-DocPath=tdeioslave/ldap.html
+DocPath=tdeioslave/ldap/index.html
 Icon=kaddressbook
diff --git a/tdeioslave/ldap/ldaps.protocol b/tdeioslave/ldap/ldaps.protocol
index 2bcb2234c..4951acdb2 100644
--- a/tdeioslave/ldap/ldaps.protocol
+++ b/tdeioslave/ldap/ldaps.protocol
@@ -13,5 +13,5 @@ deleting=true
 #moving=true
 mimetype=text/plain
 determineMimetypeFromExtension=false
-DocPath=tdeioslave/ldap.html
+DocPath=tdeioslave/ldap/index.html
 Icon=kaddressbook
diff --git a/tdeioslave/mac/mac.protocol b/tdeioslave/mac/mac.protocol
index c21307a89..288e70236 100644
--- a/tdeioslave/mac/mac.protocol
+++ b/tdeioslave/mac/mac.protocol
@@ -70,4 +70,4 @@ Description[wa]=On tdeioslave po MacOS HFS + pårticions
 Description[zh_CN]=MacOS HFS+ 分区的 TDEIO 仆人
 Description[zh_TW]=用於 MacOS HFS+ 分割區的 tdeioslave
 Icon=mac
-DocPath=tdeioslave/mac.html
+DocPath=tdeioslave/mac/index.html
diff --git a/tdeioslave/man/man.protocol b/tdeioslave/man/man.protocol
index 37a57cec4..cda7f61c9 100644
--- a/tdeioslave/man/man.protocol
+++ b/tdeioslave/man/man.protocol
@@ -7,6 +7,6 @@ reading=true
 listing=Name
 defaultMimetype=text/html
 determineMimetypeFromExtension=false
-DocPath=tdeioslave/man.html
+DocPath=tdeioslave/man/index.html
 Icon=man
 Class=:local
diff --git a/tdeioslave/media/media.protocol b/tdeioslave/media/media.protocol
index c390d6fca..35b4b0939 100644
--- a/tdeioslave/media/media.protocol
+++ b/tdeioslave/media/media.protocol
@@ -12,7 +12,7 @@ linking=true
 moving=true
 Icon=system
 maxInstances=4
-#TODO DocPath=tdeioslave/file.html
+#TODO DocPath=tdeioslave/media/index.html
 Class=:local
 deleteRecursive=true
 fileNameUsedForCopying=Name
diff --git a/tdeioslave/nfs/nfs.protocol b/tdeioslave/nfs/nfs.protocol
index faaa442e1..e8156e470 100644
--- a/tdeioslave/nfs/nfs.protocol
+++ b/tdeioslave/nfs/nfs.protocol
@@ -10,5 +10,5 @@ makedir=true
 deleting=true
 linking=true
 moving=true
-DocPath=tdeioslave/nfs.html
+DocPath=tdeioslave/nfs/index.html
 Icon=nfs_mount
diff --git a/tdeioslave/nntp/nntp.protocol b/tdeioslave/nntp/nntp.protocol
index ed5754bb6..e9946a08f 100644
--- a/tdeioslave/nntp/nntp.protocol
+++ b/tdeioslave/nntp/nntp.protocol
@@ -7,5 +7,5 @@ listing=Name,Type,Size
 reading=true
 writing=true
 deleting=false
-DocPath=tdeioslave/nntp.html
+DocPath=tdeioslave/nntp/index.html
 Icon=news
diff --git a/tdeioslave/nntp/nntps.protocol b/tdeioslave/nntp/nntps.protocol
index aafa37218..6e26b9d1e 100644
--- a/tdeioslave/nntp/nntps.protocol
+++ b/tdeioslave/nntp/nntps.protocol
@@ -7,5 +7,5 @@ listing=Name,Type,Size
 reading=true
 writing=true
 deleting=false
-DocPath=tdeioslave/nntp.html
+DocPath=tdeioslave/nntps/index.html
 Icon=news
diff --git a/tdeioslave/pop3/pop3.protocol b/tdeioslave/pop3/pop3.protocol
index 7aa3e442f..614b7be26 100644
--- a/tdeioslave/pop3/pop3.protocol
+++ b/tdeioslave/pop3/pop3.protocol
@@ -12,5 +12,5 @@ source=true
 makedir=false
 linking=false
 moving=false
-DocPath=tdeioslave/pop3.html
+DocPath=tdeioslave/pop3/index.html
 Icon=folder_inbox
diff --git a/tdeioslave/pop3/pop3s.protocol b/tdeioslave/pop3/pop3s.protocol
index 772f72d37..3dbbbab5b 100644
--- a/tdeioslave/pop3/pop3s.protocol
+++ b/tdeioslave/pop3/pop3s.protocol
@@ -12,5 +12,5 @@ source=true
 makedir=false
 linking=false
 moving=false
-DocPath=tdeioslave/pop3s.html
+DocPath=tdeioslave/pop3/index.html
 Icon=folder_inbox
diff --git a/tdeioslave/remote/remote.protocol b/tdeioslave/remote/remote.protocol
index 2d28b3a47..c360eead8 100644
--- a/tdeioslave/remote/remote.protocol
+++ b/tdeioslave/remote/remote.protocol
@@ -12,6 +12,6 @@ linking=true
 moving=true
 Icon=network
 maxInstances=4
-#TODO DocPath=tdeioslave/file.html
+#TODO DocPath=tdeioslave/remote/index.html
 Class=:local
 deleteRecursive=true
diff --git a/tdeioslave/sftp/sftp.protocol b/tdeioslave/sftp/sftp.protocol
index 6c998f02d..f7570e178 100644
--- a/tdeioslave/sftp/sftp.protocol
+++ b/tdeioslave/sftp/sftp.protocol
@@ -79,6 +79,6 @@ Description[vi]=A tdeioslave (đày tớ vào ra KDE) cho sftp
 Description[wa]=On tdeioslave po sftp
 Description[zh_CN]=sftp 的 tdeioslave
 Description[zh_TW]=sftp 的 tdeioslave
-DocPath=tdeioslave/sftp.html
+DocPath=tdeioslave/sftp/index.html
 Icon=ftp
 Class=:internet
diff --git a/tdeioslave/smb/smb.protocol b/tdeioslave/smb/smb.protocol
index 06ac69a10..9e8cbd85a 100644
--- a/tdeioslave/smb/smb.protocol
+++ b/tdeioslave/smb/smb.protocol
@@ -8,5 +8,5 @@ reading=true
 writing=true
 makedir=true
 deleting=true
-DocPath=tdeioslave/smb.html
+DocPath=tdeioslave/smb/index.html
 Icon=samba
diff --git a/tdeioslave/smtp/smtp.protocol b/tdeioslave/smtp/smtp.protocol
index 4e757c7bd..3622298e9 100644
--- a/tdeioslave/smtp/smtp.protocol
+++ b/tdeioslave/smtp/smtp.protocol
@@ -12,5 +12,5 @@ source=true
 makedir=false
 linking=false
 moving=false
-DocPath=tdeioslave/smtp.html
+DocPath=tdeioslave/smtp/index.html
 Icon=folder_outbox
diff --git a/tdeioslave/system/system.protocol b/tdeioslave/system/system.protocol
index 12f6c5351..0b3012c8b 100644
--- a/tdeioslave/system/system.protocol
+++ b/tdeioslave/system/system.protocol
@@ -12,7 +12,7 @@ linking=true
 moving=true
 Icon=system
 maxInstances=4
-#TODO DocPath=tdeioslave/file.html
+#TODO DocPath=tdeioslave/system/index.html
 Class=:local
 deleteRecursive=true
 fileNameUsedForCopying=Name
diff --git a/tdeioslave/tar/ar.protocol b/tdeioslave/tar/ar.protocol
index 61779dbcb..df5c93fa2 100644
--- a/tdeioslave/tar/ar.protocol
+++ b/tdeioslave/tar/ar.protocol
@@ -7,6 +7,6 @@ output=filesystem
 listing=Name,Type,Size,Date,Access,Owner,Group,Link
 reading=true
 source=true
-DocPath=tdeioslave/ar.html
-Icon=ar
+DocPath=tdeioslave/ar/index.html
+Icon=tar
 Class=:local
diff --git a/tdeioslave/tar/tar.protocol b/tdeioslave/tar/tar.protocol
index 83d5fa667..79c9ae16b 100644
--- a/tdeioslave/tar/tar.protocol
+++ b/tdeioslave/tar/tar.protocol
@@ -7,6 +7,6 @@ output=filesystem
 listing=Name,Type,Size,Date,Access,Owner,Group,Link
 reading=true
 source=true
-DocPath=tdeioslave/tar.html
+DocPath=tdeioslave/tar/index.html
 Icon=tar
 Class=:local
diff --git a/tdeioslave/tar/zip.protocol b/tdeioslave/tar/zip.protocol
index b16f820aa..75a20dcbf 100644
--- a/tdeioslave/tar/zip.protocol
+++ b/tdeioslave/tar/zip.protocol
@@ -7,6 +7,6 @@ output=filesystem
 listing=Name,Type,Size,Date,Access,Owner,Group,Link
 reading=true
 source=true
-DocPath=tdeioslave/zip.html
+DocPath=tdeioslave/zip/index.html
 Icon=zip
 Class=:local
diff --git a/tdeioslave/thumbnail/thumbnail.protocol b/tdeioslave/thumbnail/thumbnail.protocol
index fb5f2136e..59ab4d51c 100644
--- a/tdeioslave/thumbnail/thumbnail.protocol
+++ b/tdeioslave/thumbnail/thumbnail.protocol
@@ -5,5 +5,5 @@ input=stream
 output=stream
 reading=true
 source=false
-DocPath=tdeioslave/thumbnail.html
+DocPath=tdeioslave/thumbnail/index.html
 Icon=thumbnail