summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt8
-rw-r--r--Makefile.am.in2
-rw-r--r--config.h.cmake2
-rw-r--r--doc/tdeioslave/CMakeLists.txt9
-rw-r--r--doc/tdeioslave/Makefile.am4
-rw-r--r--doc/tdeioslave/mbox/CMakeLists.txt9
-rw-r--r--doc/tdeioslave/mbox/Makefile.am2
-rw-r--r--doc/tdeioslave/mbox/index.docbook25
-rw-r--r--doc/tdeioslave/sieve/CMakeLists.txt9
-rw-r--r--doc/tdeioslave/sieve/Makefile.am2
-rw-r--r--doc/tdeioslave/sieve/index.docbook27
-rw-r--r--tdeioslave/CMakeLists.txt (renamed from tdeioslaves/CMakeLists.txt)0
-rw-r--r--tdeioslave/ConfigureChecks.cmake (renamed from tdeioslaves/ConfigureChecks.cmake)0
-rw-r--r--tdeioslave/Mainpage.dox (renamed from tdeioslaves/Mainpage.dox)0
-rw-r--r--tdeioslave/Makefile.am (renamed from tdeioslaves/Makefile.am)2
-rw-r--r--tdeioslave/configure.in.bot (renamed from tdeioslaves/configure.in.bot)0
-rw-r--r--tdeioslave/configure.in.in (renamed from tdeioslaves/configure.in.in)0
-rw-r--r--tdeioslave/imap4/CMakeLists.txt (renamed from tdeioslaves/imap4/CMakeLists.txt)0
-rw-r--r--tdeioslave/imap4/Makefile.am (renamed from tdeioslaves/imap4/Makefile.am)0
-rw-r--r--tdeioslave/imap4/PATCHING (renamed from tdeioslaves/imap4/PATCHING)0
-rw-r--r--tdeioslave/imap4/README (renamed from tdeioslaves/imap4/README)0
-rw-r--r--tdeioslave/imap4/configure.in.in (renamed from tdeioslaves/imap4/configure.in.in)0
-rw-r--r--tdeioslave/imap4/imap4.cc (renamed from tdeioslaves/imap4/imap4.cc)0
-rw-r--r--tdeioslave/imap4/imap4.h (renamed from tdeioslaves/imap4/imap4.h)0
-rw-r--r--tdeioslave/imap4/imap4.protocol (renamed from tdeioslaves/imap4/imap4.protocol)0
-rw-r--r--tdeioslave/imap4/imapcommand.cc (renamed from tdeioslaves/imap4/imapcommand.cc)0
-rw-r--r--tdeioslave/imap4/imapcommand.h (renamed from tdeioslaves/imap4/imapcommand.h)0
-rw-r--r--tdeioslave/imap4/imapinfo.cc (renamed from tdeioslaves/imap4/imapinfo.cc)0
-rw-r--r--tdeioslave/imap4/imapinfo.h (renamed from tdeioslaves/imap4/imapinfo.h)0
-rw-r--r--tdeioslave/imap4/imaplist.cc (renamed from tdeioslaves/imap4/imaplist.cc)0
-rw-r--r--tdeioslave/imap4/imaplist.h (renamed from tdeioslaves/imap4/imaplist.h)0
-rw-r--r--tdeioslave/imap4/imapparser.cc (renamed from tdeioslaves/imap4/imapparser.cc)0
-rw-r--r--tdeioslave/imap4/imapparser.h (renamed from tdeioslaves/imap4/imapparser.h)0
-rw-r--r--tdeioslave/imap4/imaps.protocol (renamed from tdeioslaves/imap4/imaps.protocol)2
-rw-r--r--tdeioslave/imap4/mailaddress.cc (renamed from tdeioslaves/imap4/mailaddress.cc)0
-rw-r--r--tdeioslave/imap4/mailaddress.h (renamed from tdeioslaves/imap4/mailaddress.h)0
-rw-r--r--tdeioslave/imap4/mailheader.cc (renamed from tdeioslaves/imap4/mailheader.cc)0
-rw-r--r--tdeioslave/imap4/mailheader.h (renamed from tdeioslaves/imap4/mailheader.h)0
-rw-r--r--tdeioslave/imap4/mimehdrline.cc (renamed from tdeioslaves/imap4/mimehdrline.cc)0
-rw-r--r--tdeioslave/imap4/mimehdrline.h (renamed from tdeioslaves/imap4/mimehdrline.h)0
-rw-r--r--tdeioslave/imap4/mimeheader.cc (renamed from tdeioslaves/imap4/mimeheader.cc)0
-rw-r--r--tdeioslave/imap4/mimeheader.h (renamed from tdeioslaves/imap4/mimeheader.h)0
-rw-r--r--tdeioslave/imap4/mimeio.cc (renamed from tdeioslaves/imap4/mimeio.cc)0
-rw-r--r--tdeioslave/imap4/mimeio.h (renamed from tdeioslaves/imap4/mimeio.h)0
-rw-r--r--tdeioslave/imap4/rfcdecoder.cc (renamed from tdeioslaves/imap4/rfcdecoder.cc)0
-rw-r--r--tdeioslave/imap4/rfcdecoder.h (renamed from tdeioslaves/imap4/rfcdecoder.h)0
-rw-r--r--tdeioslave/imap4/selectinfo.h (renamed from tdeioslaves/imap4/selectinfo.h)0
-rw-r--r--tdeioslave/mbox/AUTHORS (renamed from tdeioslaves/mbox/AUTHORS)0
-rw-r--r--tdeioslave/mbox/CMakeLists.txt (renamed from tdeioslaves/mbox/CMakeLists.txt)0
-rw-r--r--tdeioslave/mbox/Makefile.am (renamed from tdeioslaves/mbox/Makefile.am)0
-rw-r--r--tdeioslave/mbox/README (renamed from tdeioslaves/mbox/README)0
-rw-r--r--tdeioslave/mbox/mbox.cc (renamed from tdeioslaves/mbox/mbox.cc)0
-rw-r--r--tdeioslave/mbox/mbox.h (renamed from tdeioslaves/mbox/mbox.h)0
-rw-r--r--tdeioslave/mbox/mbox.protocol (renamed from tdeioslaves/mbox/mbox.protocol)0
-rw-r--r--tdeioslave/mbox/mboxfile.cc (renamed from tdeioslaves/mbox/mboxfile.cc)0
-rw-r--r--tdeioslave/mbox/mboxfile.h (renamed from tdeioslaves/mbox/mboxfile.h)0
-rw-r--r--tdeioslave/mbox/readmbox.cc (renamed from tdeioslaves/mbox/readmbox.cc)0
-rw-r--r--tdeioslave/mbox/readmbox.h (renamed from tdeioslaves/mbox/readmbox.h)0
-rw-r--r--tdeioslave/mbox/stat.cc (renamed from tdeioslaves/mbox/stat.cc)0
-rw-r--r--tdeioslave/mbox/stat.h (renamed from tdeioslaves/mbox/stat.h)0
-rw-r--r--tdeioslave/mbox/urlinfo.cc (renamed from tdeioslaves/mbox/urlinfo.cc)0
-rw-r--r--tdeioslave/mbox/urlinfo.h (renamed from tdeioslaves/mbox/urlinfo.h)0
-rw-r--r--tdeioslave/opengroupware/Makefile.am (renamed from tdeioslaves/opengroupware/Makefile.am)0
-rw-r--r--tdeioslave/opengroupware/opengroupware.cpp (renamed from tdeioslaves/opengroupware/opengroupware.cpp)0
-rw-r--r--tdeioslave/opengroupware/opengroupware.h (renamed from tdeioslaves/opengroupware/opengroupware.h)0
-rw-r--r--tdeioslave/opengroupware/opengroupware.protocol (renamed from tdeioslaves/opengroupware/opengroupware.protocol)0
-rw-r--r--tdeioslave/opengroupware/opengroupwares.protocol (renamed from tdeioslaves/opengroupware/opengroupwares.protocol)0
-rw-r--r--tdeioslave/opengroupware/webdavhandler.cpp (renamed from tdeioslaves/opengroupware/webdavhandler.cpp)0
-rw-r--r--tdeioslave/opengroupware/webdavhandler.h (renamed from tdeioslaves/opengroupware/webdavhandler.h)0
-rw-r--r--tdeioslave/sieve/CMakeLists.txt (renamed from tdeioslaves/sieve/CMakeLists.txt)0
-rw-r--r--tdeioslave/sieve/Makefile.am (renamed from tdeioslaves/sieve/Makefile.am)0
-rw-r--r--tdeioslave/sieve/configure.in.in (renamed from tdeioslaves/sieve/configure.in.in)0
-rw-r--r--tdeioslave/sieve/draft-daboo-sieve-include.txt (renamed from tdeioslaves/sieve/draft-daboo-sieve-include.txt)0
-rw-r--r--tdeioslave/sieve/draft-daboo-sieve-spamtest.txt (renamed from tdeioslaves/sieve/draft-daboo-sieve-spamtest.txt)0
-rw-r--r--tdeioslave/sieve/draft-degener-sieve-body-00.txt (renamed from tdeioslaves/sieve/draft-degener-sieve-body-00.txt)0
-rw-r--r--tdeioslave/sieve/draft-degener-sieve-copy.txt (renamed from tdeioslaves/sieve/draft-degener-sieve-copy.txt)0
-rw-r--r--tdeioslave/sieve/draft-degener-sieve-editheader.txt (renamed from tdeioslaves/sieve/draft-degener-sieve-editheader.txt)0
-rw-r--r--tdeioslave/sieve/draft-degener-sieve-multiscript.txt (renamed from tdeioslaves/sieve/draft-degener-sieve-multiscript.txt)0
-rw-r--r--tdeioslave/sieve/draft-homme-sieve-variables.txt (renamed from tdeioslaves/sieve/draft-homme-sieve-variables.txt)0
-rw-r--r--tdeioslave/sieve/draft-martin-managesieve-04.txt (renamed from tdeioslaves/sieve/draft-martin-managesieve-04.txt)0
-rw-r--r--tdeioslave/sieve/draft-martin-sieve-notify-01.txt (renamed from tdeioslaves/sieve/draft-martin-sieve-notify-01.txt)0
-rw-r--r--tdeioslave/sieve/draft-melnikov-sieve-imapflags.txt (renamed from tdeioslaves/sieve/draft-melnikov-sieve-imapflags.txt)0
-rw-r--r--tdeioslave/sieve/draft-murchison-sieve-regex-06.txt (renamed from tdeioslaves/sieve/draft-murchison-sieve-regex-06.txt)0
-rw-r--r--tdeioslave/sieve/draft-murchison-sieve-subaddress-05.txt (renamed from tdeioslaves/sieve/draft-murchison-sieve-subaddress-05.txt)0
-rw-r--r--tdeioslave/sieve/draft-showalter-sieve-vacation-04.txt (renamed from tdeioslaves/sieve/draft-showalter-sieve-vacation-04.txt)0
-rw-r--r--tdeioslave/sieve/rfc3028.txt (renamed from tdeioslaves/sieve/rfc3028.txt)0
-rw-r--r--tdeioslave/sieve/rfc3431.txt (renamed from tdeioslaves/sieve/rfc3431.txt)0
-rw-r--r--tdeioslave/sieve/sieve.cpp (renamed from tdeioslaves/sieve/sieve.cpp)0
-rw-r--r--tdeioslave/sieve/sieve.h (renamed from tdeioslaves/sieve/sieve.h)0
-rw-r--r--tdeioslave/sieve/sieve.protocol (renamed from tdeioslaves/sieve/sieve.protocol)0
90 files changed, 95 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ecb8ab7b..065ddba0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,7 +88,7 @@ endif( )
# WITH_ARTS affects kalarm
# WITH_ARTS description without arts kalarm won't play sounds
# with messages.
-# WITH_SASL affects tdeioslaves(sieve imap4)
+# WITH_SASL affects tdeioslave(sieve imap4)
# WITH_SASL description sieve tdeioslave won't build without sasl and
# imap4 tdeioslave will lose the ability of SASL
# authentification
@@ -138,7 +138,7 @@ option( BUILD_LIBKPGP "Build libkpgp" ${BUILD_ALL} )
option( BUILD_MIMELIB "Build mimelib" ${BUILD_ALL} )
option( BUILD_LIBKSIEVE "Build libksieve" ${BUILD_ALL} )
option( BUILD_LIBKPIMEXCHANGE "Build libkpimexchange" ${BUILD_ALL} )
-option( BUILD_TDEIOSLAVES "Build tdeioslaves" ${BUILD_ALL} )
+option( BUILD_TDEIOSLAVE "Build tdeioslave" ${BUILD_ALL} )
option( BUILD_KMAIL "Build kmail" ${BUILD_ALL} )
option( BUILD_AKREGATOR "Build akregator" ${BUILD_ALL} )
option( BUILD_KALARM "Build kalarm" ${BUILD_ALL} )
@@ -185,7 +185,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
##### activate dependencies #####################
-if( BUILD_LIBKCAL OR BUILD_LIBTDEPIM OR BUILD_LIBKPIMIDENTITIES OR BUILD_TDEIOSLAVES OR BUILD_KMAIL OR BUILD_KNODE )
+if( BUILD_LIBKCAL OR BUILD_LIBTDEPIM OR BUILD_LIBKPIMIDENTITIES OR BUILD_TDEIOSLAVE OR BUILD_KMAIL OR BUILD_KNODE )
add_subdirectory( libemailfunctions )
endif()
@@ -209,7 +209,7 @@ tde_conditional_add_subdirectory( BUILD_LIBKPGP libkpgp )
tde_conditional_add_subdirectory( BUILD_MIMELIB mimelib )
tde_conditional_add_subdirectory( BUILD_LIBKSIEVE libksieve )
tde_conditional_add_subdirectory( BUILD_LIBKPIMEXCHANGE libkpimexchange )
-tde_conditional_add_subdirectory( BUILD_TDEIOSLAVES tdeioslaves )
+tde_conditional_add_subdirectory( BUILD_TDEIOSLAVE tdeioslave )
tde_conditional_add_subdirectory( BUILD_KMAIL kmail )
tde_conditional_add_subdirectory( BUILD_AKREGATOR akregator )
tde_conditional_add_subdirectory( BUILD_KALARM kalarm )
diff --git a/Makefile.am.in b/Makefile.am.in
index 429c9ee70..929b518cd 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -28,7 +28,7 @@ COMPILE_BEFORE_knode= libtdepim libkpgp libkmime
COMPILE_BEFORE_karm = libtdepim tderesources
COMPILE_BEFORE_plugins = kmail libtdepim libkcal
COMPILE_BEFORE_kontact = kaddressbook knotes korganizer akregator karm
-COMPILE_BEFORE_tdeioslaves = libkmime libtdepim
+COMPILE_BEFORE_tdeioslave = libkmime libtdepim
COMPILE_BEFORE_libkpimexchange = libtdepim
COMPILE_BEFORE_kalarm = libtdepim libkmime
COMPILE_BEFORE_tderesources = libkpimexchange knotes kaddressbook kode
diff --git a/config.h.cmake b/config.h.cmake
index bc498ab1f..eecbf4978 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -29,7 +29,7 @@
#cmakedefine MAX_CMD_LENGTH @MAX_CMD_LENGTH@
#cmakedefine HAVE_C99_INITIALIZERS 1
-// tdeioslaves
+// tdeioslave
#cmakedefine HAVE_LIBSASL2 1
// kmail
diff --git a/doc/tdeioslave/CMakeLists.txt b/doc/tdeioslave/CMakeLists.txt
new file mode 100644
index 000000000..6bc5f1878
--- /dev/null
+++ b/doc/tdeioslave/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+tde_auto_add_subdirectories()
diff --git a/doc/tdeioslave/Makefile.am b/doc/tdeioslave/Makefile.am
new file mode 100644
index 000000000..561d25fa8
--- /dev/null
+++ b/doc/tdeioslave/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS = $(AUTODIRS)
+KDE_LANG = en
+KDE_DOCS = AUTO
+
diff --git a/doc/tdeioslave/mbox/CMakeLists.txt b/doc/tdeioslave/mbox/CMakeLists.txt
new file mode 100644
index 000000000..b1aec04e6
--- /dev/null
+++ b/doc/tdeioslave/mbox/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/mbox )
diff --git a/doc/tdeioslave/mbox/Makefile.am b/doc/tdeioslave/mbox/Makefile.am
new file mode 100644
index 000000000..e96501e58
--- /dev/null
+++ b/doc/tdeioslave/mbox/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/mbox
diff --git a/doc/tdeioslave/mbox/index.docbook b/doc/tdeioslave/mbox/index.docbook
new file mode 100644
index 000000000..78784aea7
--- /dev/null
+++ b/doc/tdeioslave/mbox/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 % addindex "IGNORE">
+ <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
+<article lang="&language;" id="mbox">
+<title>mbox</title>
+
+<articleinfo>
+
+<authorgroup>
+<author><personname><firstname>Bertjan</firstname><surname>Broeksema</surname></personname></author>
+<author>&tde-authors;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+</articleinfo>
+
+<para>The mbox file format is an simple but rather inefficient way to store email
+messages. All messages are appended after each other in the same file
+separated by a special separator line. This gets especially expensive when
+you have many emails in the same file.</para>
+
+</article>
diff --git a/doc/tdeioslave/sieve/CMakeLists.txt b/doc/tdeioslave/sieve/CMakeLists.txt
new file mode 100644
index 000000000..22ff51a85
--- /dev/null
+++ b/doc/tdeioslave/sieve/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdeioslave/sieve )
diff --git a/doc/tdeioslave/sieve/Makefile.am b/doc/tdeioslave/sieve/Makefile.am
new file mode 100644
index 000000000..b4c57786e
--- /dev/null
+++ b/doc/tdeioslave/sieve/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = tdeioslave/sieve
diff --git a/doc/tdeioslave/sieve/index.docbook b/doc/tdeioslave/sieve/index.docbook
new file mode 100644
index 000000000..4c99a532a
--- /dev/null
+++ b/doc/tdeioslave/sieve/index.docbook
@@ -0,0 +1,27 @@
+<?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="sieve">
+<title>sieve</title>
+
+<articleinfo>
+
+<authorgroup>
+<author><personname><firstname>Daniel</firstname><surname>Black</surname></personname></author>
+<author>&tde-authors;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+</articleinfo>
+
+<para>Sieve is a protocol that is used to manage filters for email.</para>
+
+<para>The filters are stored and run on the email server.</para>
+
+<para><ulink url="http://www.ietf.org/rfc/rfc5228.txt">IETF
+RF5228</ulink> provides more information.</para>
+
+</article>
diff --git a/tdeioslaves/CMakeLists.txt b/tdeioslave/CMakeLists.txt
index 567a1434b..567a1434b 100644
--- a/tdeioslaves/CMakeLists.txt
+++ b/tdeioslave/CMakeLists.txt
diff --git a/tdeioslaves/ConfigureChecks.cmake b/tdeioslave/ConfigureChecks.cmake
index 9cbd46c01..9cbd46c01 100644
--- a/tdeioslaves/ConfigureChecks.cmake
+++ b/tdeioslave/ConfigureChecks.cmake
diff --git a/tdeioslaves/Mainpage.dox b/tdeioslave/Mainpage.dox
index 24e1ca685..24e1ca685 100644
--- a/tdeioslaves/Mainpage.dox
+++ b/tdeioslave/Mainpage.dox
diff --git a/tdeioslaves/Makefile.am b/tdeioslave/Makefile.am
index 217a0c599..50975ea11 100644
--- a/tdeioslaves/Makefile.am
+++ b/tdeioslave/Makefile.am
@@ -6,6 +6,6 @@ endif
SUBDIRS = imap4 mbox $(SIEVE_SUBDIR)
-DOXYGEN_REFERENCES = tdeioslaves/imap4 tdeioslaves/mbox
+DOXYGEN_REFERENCES = tdeioslave/imap4 tdeioslave/mbox
include $(top_srcdir)/admin/Doxyfile.am
diff --git a/tdeioslaves/configure.in.bot b/tdeioslave/configure.in.bot
index fdad4b633..fdad4b633 100644
--- a/tdeioslaves/configure.in.bot
+++ b/tdeioslave/configure.in.bot
diff --git a/tdeioslaves/configure.in.in b/tdeioslave/configure.in.in
index 43b243b2b..43b243b2b 100644
--- a/tdeioslaves/configure.in.in
+++ b/tdeioslave/configure.in.in
diff --git a/tdeioslaves/imap4/CMakeLists.txt b/tdeioslave/imap4/CMakeLists.txt
index f427c2581..f427c2581 100644
--- a/tdeioslaves/imap4/CMakeLists.txt
+++ b/tdeioslave/imap4/CMakeLists.txt
diff --git a/tdeioslaves/imap4/Makefile.am b/tdeioslave/imap4/Makefile.am
index f52af2c62..f52af2c62 100644
--- a/tdeioslaves/imap4/Makefile.am
+++ b/tdeioslave/imap4/Makefile.am
diff --git a/tdeioslaves/imap4/PATCHING b/tdeioslave/imap4/PATCHING
index 39bcdce95..39bcdce95 100644
--- a/tdeioslaves/imap4/PATCHING
+++ b/tdeioslave/imap4/PATCHING
diff --git a/tdeioslaves/imap4/README b/tdeioslave/imap4/README
index af8af8f04..af8af8f04 100644
--- a/tdeioslaves/imap4/README
+++ b/tdeioslave/imap4/README
diff --git a/tdeioslaves/imap4/configure.in.in b/tdeioslave/imap4/configure.in.in
index 680e26e0a..680e26e0a 100644
--- a/tdeioslaves/imap4/configure.in.in
+++ b/tdeioslave/imap4/configure.in.in
diff --git a/tdeioslaves/imap4/imap4.cc b/tdeioslave/imap4/imap4.cc
index 666bce9e5..666bce9e5 100644
--- a/tdeioslaves/imap4/imap4.cc
+++ b/tdeioslave/imap4/imap4.cc
diff --git a/tdeioslaves/imap4/imap4.h b/tdeioslave/imap4/imap4.h
index a6b160899..a6b160899 100644
--- a/tdeioslaves/imap4/imap4.h
+++ b/tdeioslave/imap4/imap4.h
diff --git a/tdeioslaves/imap4/imap4.protocol b/tdeioslave/imap4/imap4.protocol
index f37556c17..f37556c17 100644
--- a/tdeioslaves/imap4/imap4.protocol
+++ b/tdeioslave/imap4/imap4.protocol
diff --git a/tdeioslaves/imap4/imapcommand.cc b/tdeioslave/imap4/imapcommand.cc
index f88a65add..f88a65add 100644
--- a/tdeioslaves/imap4/imapcommand.cc
+++ b/tdeioslave/imap4/imapcommand.cc
diff --git a/tdeioslaves/imap4/imapcommand.h b/tdeioslave/imap4/imapcommand.h
index 9e2834424..9e2834424 100644
--- a/tdeioslaves/imap4/imapcommand.h
+++ b/tdeioslave/imap4/imapcommand.h
diff --git a/tdeioslaves/imap4/imapinfo.cc b/tdeioslave/imap4/imapinfo.cc
index 4d1fc805c..4d1fc805c 100644
--- a/tdeioslaves/imap4/imapinfo.cc
+++ b/tdeioslave/imap4/imapinfo.cc
diff --git a/tdeioslaves/imap4/imapinfo.h b/tdeioslave/imap4/imapinfo.h
index 735054496..735054496 100644
--- a/tdeioslaves/imap4/imapinfo.h
+++ b/tdeioslave/imap4/imapinfo.h
diff --git a/tdeioslaves/imap4/imaplist.cc b/tdeioslave/imap4/imaplist.cc
index 92918d8c1..92918d8c1 100644
--- a/tdeioslaves/imap4/imaplist.cc
+++ b/tdeioslave/imap4/imaplist.cc
diff --git a/tdeioslaves/imap4/imaplist.h b/tdeioslave/imap4/imaplist.h
index 9aa01f78d..9aa01f78d 100644
--- a/tdeioslaves/imap4/imaplist.h
+++ b/tdeioslave/imap4/imaplist.h
diff --git a/tdeioslaves/imap4/imapparser.cc b/tdeioslave/imap4/imapparser.cc
index 8cb06e318..8cb06e318 100644
--- a/tdeioslaves/imap4/imapparser.cc
+++ b/tdeioslave/imap4/imapparser.cc
diff --git a/tdeioslaves/imap4/imapparser.h b/tdeioslave/imap4/imapparser.h
index 623fc8f85..623fc8f85 100644
--- a/tdeioslaves/imap4/imapparser.h
+++ b/tdeioslave/imap4/imapparser.h
diff --git a/tdeioslaves/imap4/imaps.protocol b/tdeioslave/imap4/imaps.protocol
index b6c07040a..64a3aaf94 100644
--- a/tdeioslaves/imap4/imaps.protocol
+++ b/tdeioslave/imap4/imaps.protocol
@@ -27,4 +27,4 @@ source=true
Capabilities=Subscription,ACL,Quota
Icon=folder_inbox
-DocPath=tdeioslave/imaps/index.html
+DocPath=tdeioslave/imap/index.html
diff --git a/tdeioslaves/imap4/mailaddress.cc b/tdeioslave/imap4/mailaddress.cc
index 0ddd2ff04..0ddd2ff04 100644
--- a/tdeioslaves/imap4/mailaddress.cc
+++ b/tdeioslave/imap4/mailaddress.cc
diff --git a/tdeioslaves/imap4/mailaddress.h b/tdeioslave/imap4/mailaddress.h
index 644034b24..644034b24 100644
--- a/tdeioslaves/imap4/mailaddress.h
+++ b/tdeioslave/imap4/mailaddress.h
diff --git a/tdeioslaves/imap4/mailheader.cc b/tdeioslave/imap4/mailheader.cc
index c520b9094..c520b9094 100644
--- a/tdeioslaves/imap4/mailheader.cc
+++ b/tdeioslave/imap4/mailheader.cc
diff --git a/tdeioslaves/imap4/mailheader.h b/tdeioslave/imap4/mailheader.h
index 633d61b78..633d61b78 100644
--- a/tdeioslaves/imap4/mailheader.h
+++ b/tdeioslave/imap4/mailheader.h
diff --git a/tdeioslaves/imap4/mimehdrline.cc b/tdeioslave/imap4/mimehdrline.cc
index 9646ed26f..9646ed26f 100644
--- a/tdeioslaves/imap4/mimehdrline.cc
+++ b/tdeioslave/imap4/mimehdrline.cc
diff --git a/tdeioslaves/imap4/mimehdrline.h b/tdeioslave/imap4/mimehdrline.h
index e31c18649..e31c18649 100644
--- a/tdeioslaves/imap4/mimehdrline.h
+++ b/tdeioslave/imap4/mimehdrline.h
diff --git a/tdeioslaves/imap4/mimeheader.cc b/tdeioslave/imap4/mimeheader.cc
index d0916ba50..d0916ba50 100644
--- a/tdeioslaves/imap4/mimeheader.cc
+++ b/tdeioslave/imap4/mimeheader.cc
diff --git a/tdeioslaves/imap4/mimeheader.h b/tdeioslave/imap4/mimeheader.h
index bc2fd2bcd..bc2fd2bcd 100644
--- a/tdeioslaves/imap4/mimeheader.h
+++ b/tdeioslave/imap4/mimeheader.h
diff --git a/tdeioslaves/imap4/mimeio.cc b/tdeioslave/imap4/mimeio.cc
index 757c11a47..757c11a47 100644
--- a/tdeioslaves/imap4/mimeio.cc
+++ b/tdeioslave/imap4/mimeio.cc
diff --git a/tdeioslaves/imap4/mimeio.h b/tdeioslave/imap4/mimeio.h
index 37a96998f..37a96998f 100644
--- a/tdeioslaves/imap4/mimeio.h
+++ b/tdeioslave/imap4/mimeio.h
diff --git a/tdeioslaves/imap4/rfcdecoder.cc b/tdeioslave/imap4/rfcdecoder.cc
index 08b641b7d..08b641b7d 100644
--- a/tdeioslaves/imap4/rfcdecoder.cc
+++ b/tdeioslave/imap4/rfcdecoder.cc
diff --git a/tdeioslaves/imap4/rfcdecoder.h b/tdeioslave/imap4/rfcdecoder.h
index 2095b2ed2..2095b2ed2 100644
--- a/tdeioslaves/imap4/rfcdecoder.h
+++ b/tdeioslave/imap4/rfcdecoder.h
diff --git a/tdeioslaves/imap4/selectinfo.h b/tdeioslave/imap4/selectinfo.h
index bf75a85b8..bf75a85b8 100644
--- a/tdeioslaves/imap4/selectinfo.h
+++ b/tdeioslave/imap4/selectinfo.h
diff --git a/tdeioslaves/mbox/AUTHORS b/tdeioslave/mbox/AUTHORS
index 333010f6c..333010f6c 100644
--- a/tdeioslaves/mbox/AUTHORS
+++ b/tdeioslave/mbox/AUTHORS
diff --git a/tdeioslaves/mbox/CMakeLists.txt b/tdeioslave/mbox/CMakeLists.txt
index e74682fac..e74682fac 100644
--- a/tdeioslaves/mbox/CMakeLists.txt
+++ b/tdeioslave/mbox/CMakeLists.txt
diff --git a/tdeioslaves/mbox/Makefile.am b/tdeioslave/mbox/Makefile.am
index 4dea4644a..4dea4644a 100644
--- a/tdeioslaves/mbox/Makefile.am
+++ b/tdeioslave/mbox/Makefile.am
diff --git a/tdeioslaves/mbox/README b/tdeioslave/mbox/README
index d09e81792..d09e81792 100644
--- a/tdeioslaves/mbox/README
+++ b/tdeioslave/mbox/README
diff --git a/tdeioslaves/mbox/mbox.cc b/tdeioslave/mbox/mbox.cc
index 5742baffd..5742baffd 100644
--- a/tdeioslaves/mbox/mbox.cc
+++ b/tdeioslave/mbox/mbox.cc
diff --git a/tdeioslaves/mbox/mbox.h b/tdeioslave/mbox/mbox.h
index 5834b5a07..5834b5a07 100644
--- a/tdeioslaves/mbox/mbox.h
+++ b/tdeioslave/mbox/mbox.h
diff --git a/tdeioslaves/mbox/mbox.protocol b/tdeioslave/mbox/mbox.protocol
index 5b5447dc2..5b5447dc2 100644
--- a/tdeioslaves/mbox/mbox.protocol
+++ b/tdeioslave/mbox/mbox.protocol
diff --git a/tdeioslaves/mbox/mboxfile.cc b/tdeioslave/mbox/mboxfile.cc
index 7297457ef..7297457ef 100644
--- a/tdeioslaves/mbox/mboxfile.cc
+++ b/tdeioslave/mbox/mboxfile.cc
diff --git a/tdeioslaves/mbox/mboxfile.h b/tdeioslave/mbox/mboxfile.h
index 1defafc9b..1defafc9b 100644
--- a/tdeioslaves/mbox/mboxfile.h
+++ b/tdeioslave/mbox/mboxfile.h
diff --git a/tdeioslaves/mbox/readmbox.cc b/tdeioslave/mbox/readmbox.cc
index 942f369e5..942f369e5 100644
--- a/tdeioslaves/mbox/readmbox.cc
+++ b/tdeioslave/mbox/readmbox.cc
diff --git a/tdeioslaves/mbox/readmbox.h b/tdeioslave/mbox/readmbox.h
index 0b8872763..0b8872763 100644
--- a/tdeioslaves/mbox/readmbox.h
+++ b/tdeioslave/mbox/readmbox.h
diff --git a/tdeioslaves/mbox/stat.cc b/tdeioslave/mbox/stat.cc
index 99267ca7d..99267ca7d 100644
--- a/tdeioslaves/mbox/stat.cc
+++ b/tdeioslave/mbox/stat.cc
diff --git a/tdeioslaves/mbox/stat.h b/tdeioslave/mbox/stat.h
index 4e2c1f020..4e2c1f020 100644
--- a/tdeioslaves/mbox/stat.h
+++ b/tdeioslave/mbox/stat.h
diff --git a/tdeioslaves/mbox/urlinfo.cc b/tdeioslave/mbox/urlinfo.cc
index 4b359e403..4b359e403 100644
--- a/tdeioslaves/mbox/urlinfo.cc
+++ b/tdeioslave/mbox/urlinfo.cc
diff --git a/tdeioslaves/mbox/urlinfo.h b/tdeioslave/mbox/urlinfo.h
index 5de7804fd..5de7804fd 100644
--- a/tdeioslaves/mbox/urlinfo.h
+++ b/tdeioslave/mbox/urlinfo.h
diff --git a/tdeioslaves/opengroupware/Makefile.am b/tdeioslave/opengroupware/Makefile.am
index fbe8cee15..fbe8cee15 100644
--- a/tdeioslaves/opengroupware/Makefile.am
+++ b/tdeioslave/opengroupware/Makefile.am
diff --git a/tdeioslaves/opengroupware/opengroupware.cpp b/tdeioslave/opengroupware/opengroupware.cpp
index 304ff225f..304ff225f 100644
--- a/tdeioslaves/opengroupware/opengroupware.cpp
+++ b/tdeioslave/opengroupware/opengroupware.cpp
diff --git a/tdeioslaves/opengroupware/opengroupware.h b/tdeioslave/opengroupware/opengroupware.h
index 151187dbe..151187dbe 100644
--- a/tdeioslaves/opengroupware/opengroupware.h
+++ b/tdeioslave/opengroupware/opengroupware.h
diff --git a/tdeioslaves/opengroupware/opengroupware.protocol b/tdeioslave/opengroupware/opengroupware.protocol
index 5531f3106..5531f3106 100644
--- a/tdeioslaves/opengroupware/opengroupware.protocol
+++ b/tdeioslave/opengroupware/opengroupware.protocol
diff --git a/tdeioslaves/opengroupware/opengroupwares.protocol b/tdeioslave/opengroupware/opengroupwares.protocol
index 03bb4b1db..03bb4b1db 100644
--- a/tdeioslaves/opengroupware/opengroupwares.protocol
+++ b/tdeioslave/opengroupware/opengroupwares.protocol
diff --git a/tdeioslaves/opengroupware/webdavhandler.cpp b/tdeioslave/opengroupware/webdavhandler.cpp
index 9c89174ae..9c89174ae 100644
--- a/tdeioslaves/opengroupware/webdavhandler.cpp
+++ b/tdeioslave/opengroupware/webdavhandler.cpp
diff --git a/tdeioslaves/opengroupware/webdavhandler.h b/tdeioslave/opengroupware/webdavhandler.h
index a86332a32..a86332a32 100644
--- a/tdeioslaves/opengroupware/webdavhandler.h
+++ b/tdeioslave/opengroupware/webdavhandler.h
diff --git a/tdeioslaves/sieve/CMakeLists.txt b/tdeioslave/sieve/CMakeLists.txt
index 7e6628c83..7e6628c83 100644
--- a/tdeioslaves/sieve/CMakeLists.txt
+++ b/tdeioslave/sieve/CMakeLists.txt
diff --git a/tdeioslaves/sieve/Makefile.am b/tdeioslave/sieve/Makefile.am
index 0db2e374d..0db2e374d 100644
--- a/tdeioslaves/sieve/Makefile.am
+++ b/tdeioslave/sieve/Makefile.am
diff --git a/tdeioslaves/sieve/configure.in.in b/tdeioslave/sieve/configure.in.in
index ffc1b4b7e..ffc1b4b7e 100644
--- a/tdeioslaves/sieve/configure.in.in
+++ b/tdeioslave/sieve/configure.in.in
diff --git a/tdeioslaves/sieve/draft-daboo-sieve-include.txt b/tdeioslave/sieve/draft-daboo-sieve-include.txt
index 83a08dfb8..83a08dfb8 100644
--- a/tdeioslaves/sieve/draft-daboo-sieve-include.txt
+++ b/tdeioslave/sieve/draft-daboo-sieve-include.txt
diff --git a/tdeioslaves/sieve/draft-daboo-sieve-spamtest.txt b/tdeioslave/sieve/draft-daboo-sieve-spamtest.txt
index 8f22e5607..8f22e5607 100644
--- a/tdeioslaves/sieve/draft-daboo-sieve-spamtest.txt
+++ b/tdeioslave/sieve/draft-daboo-sieve-spamtest.txt
diff --git a/tdeioslaves/sieve/draft-degener-sieve-body-00.txt b/tdeioslave/sieve/draft-degener-sieve-body-00.txt
index 7b1ee844e..7b1ee844e 100644
--- a/tdeioslaves/sieve/draft-degener-sieve-body-00.txt
+++ b/tdeioslave/sieve/draft-degener-sieve-body-00.txt
diff --git a/tdeioslaves/sieve/draft-degener-sieve-copy.txt b/tdeioslave/sieve/draft-degener-sieve-copy.txt
index 8c23855c8..8c23855c8 100644
--- a/tdeioslaves/sieve/draft-degener-sieve-copy.txt
+++ b/tdeioslave/sieve/draft-degener-sieve-copy.txt
diff --git a/tdeioslaves/sieve/draft-degener-sieve-editheader.txt b/tdeioslave/sieve/draft-degener-sieve-editheader.txt
index 6e9674f9d..6e9674f9d 100644
--- a/tdeioslaves/sieve/draft-degener-sieve-editheader.txt
+++ b/tdeioslave/sieve/draft-degener-sieve-editheader.txt
diff --git a/tdeioslaves/sieve/draft-degener-sieve-multiscript.txt b/tdeioslave/sieve/draft-degener-sieve-multiscript.txt
index 53a838226..53a838226 100644
--- a/tdeioslaves/sieve/draft-degener-sieve-multiscript.txt
+++ b/tdeioslave/sieve/draft-degener-sieve-multiscript.txt
diff --git a/tdeioslaves/sieve/draft-homme-sieve-variables.txt b/tdeioslave/sieve/draft-homme-sieve-variables.txt
index cccaa59c8..cccaa59c8 100644
--- a/tdeioslaves/sieve/draft-homme-sieve-variables.txt
+++ b/tdeioslave/sieve/draft-homme-sieve-variables.txt
diff --git a/tdeioslaves/sieve/draft-martin-managesieve-04.txt b/tdeioslave/sieve/draft-martin-managesieve-04.txt
index 82684ad57..82684ad57 100644
--- a/tdeioslaves/sieve/draft-martin-managesieve-04.txt
+++ b/tdeioslave/sieve/draft-martin-managesieve-04.txt
diff --git a/tdeioslaves/sieve/draft-martin-sieve-notify-01.txt b/tdeioslave/sieve/draft-martin-sieve-notify-01.txt
index 6eb1cac33..6eb1cac33 100644
--- a/tdeioslaves/sieve/draft-martin-sieve-notify-01.txt
+++ b/tdeioslave/sieve/draft-martin-sieve-notify-01.txt
diff --git a/tdeioslaves/sieve/draft-melnikov-sieve-imapflags.txt b/tdeioslave/sieve/draft-melnikov-sieve-imapflags.txt
index 71cfbb3ce..71cfbb3ce 100644
--- a/tdeioslaves/sieve/draft-melnikov-sieve-imapflags.txt
+++ b/tdeioslave/sieve/draft-melnikov-sieve-imapflags.txt
diff --git a/tdeioslaves/sieve/draft-murchison-sieve-regex-06.txt b/tdeioslave/sieve/draft-murchison-sieve-regex-06.txt
index b3e922ee8..b3e922ee8 100644
--- a/tdeioslaves/sieve/draft-murchison-sieve-regex-06.txt
+++ b/tdeioslave/sieve/draft-murchison-sieve-regex-06.txt
diff --git a/tdeioslaves/sieve/draft-murchison-sieve-subaddress-05.txt b/tdeioslave/sieve/draft-murchison-sieve-subaddress-05.txt
index 95cea85a7..95cea85a7 100644
--- a/tdeioslaves/sieve/draft-murchison-sieve-subaddress-05.txt
+++ b/tdeioslave/sieve/draft-murchison-sieve-subaddress-05.txt
diff --git a/tdeioslaves/sieve/draft-showalter-sieve-vacation-04.txt b/tdeioslave/sieve/draft-showalter-sieve-vacation-04.txt
index bd2d33593..bd2d33593 100644
--- a/tdeioslaves/sieve/draft-showalter-sieve-vacation-04.txt
+++ b/tdeioslave/sieve/draft-showalter-sieve-vacation-04.txt
diff --git a/tdeioslaves/sieve/rfc3028.txt b/tdeioslave/sieve/rfc3028.txt
index b861e2e14..b861e2e14 100644
--- a/tdeioslaves/sieve/rfc3028.txt
+++ b/tdeioslave/sieve/rfc3028.txt
diff --git a/tdeioslaves/sieve/rfc3431.txt b/tdeioslave/sieve/rfc3431.txt
index 3f11c3259..3f11c3259 100644
--- a/tdeioslaves/sieve/rfc3431.txt
+++ b/tdeioslave/sieve/rfc3431.txt
diff --git a/tdeioslaves/sieve/sieve.cpp b/tdeioslave/sieve/sieve.cpp
index b36336400..b36336400 100644
--- a/tdeioslaves/sieve/sieve.cpp
+++ b/tdeioslave/sieve/sieve.cpp
diff --git a/tdeioslaves/sieve/sieve.h b/tdeioslave/sieve/sieve.h
index 09cf3060b..09cf3060b 100644
--- a/tdeioslaves/sieve/sieve.h
+++ b/tdeioslave/sieve/sieve.h
diff --git a/tdeioslaves/sieve/sieve.protocol b/tdeioslave/sieve/sieve.protocol
index 572c41ea9..572c41ea9 100644
--- a/tdeioslaves/sieve/sieve.protocol
+++ b/tdeioslave/sieve/sieve.protocol