[evolution-data-server] Fix distcheck errors.



commit dd6b2afa7e739c11eba30e47319f9f2724a4e909
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Apr 6 21:03:53 2010 -0400

    Fix distcheck errors.

 camel/tests/folder/test1.c                         |    4 -
 camel/tests/folder/test10.c                        |    4 -
 camel/tests/folder/test11.c                        |    4 -
 camel/tests/folder/test2.c                         |    8 -
 camel/tests/folder/test3.c                         |    8 -
 camel/tests/folder/test4.c                         |    4 -
 camel/tests/folder/test5.c                         |    4 -
 camel/tests/folder/test6.c                         |    8 -
 camel/tests/folder/test7.c                         |    8 -
 camel/tests/folder/test8.c                         |    4 -
 camel/tests/folder/test9.c                         |   10 -
 camel/tests/lib/addresses.h                        |    3 +-
 camel/tests/lib/camel-test-provider.c              |    4 -
 camel/tests/lib/camel-test.c                       |    2 -
 camel/tests/lib/camel-test.h                       |    2 +-
 camel/tests/lib/folders.c                          |    2 -
 camel/tests/lib/folders.h                          |    7 -
 camel/tests/lib/messages.c                         |    5 -
 camel/tests/lib/messages.h                         |    3 +-
 camel/tests/lib/session.h                          |    2 +-
 camel/tests/lib/streams.c                          |    4 -
 camel/tests/lib/streams.h                          |    3 +-
 camel/tests/message/test1.c                        |    4 -
 camel/tests/message/test2.c                        |    3 -
 camel/tests/message/test3.c                        |    5 -
 camel/tests/message/test4.c                        |    5 -
 camel/tests/mime-filter/test-charset.c             |    9 +-
 camel/tests/mime-filter/test-crlf.c                |    7 +-
 camel/tests/mime-filter/test-tohtml.c              |    9 +-
 camel/tests/mime-filter/test1.c                    |    7 +-
 camel/tests/misc/rfc2047.c                         |    2 -
 camel/tests/misc/split.c                           |    1 -
 camel/tests/misc/test1.c                           |    2 -
 camel/tests/misc/test2.c                           |    2 -
 camel/tests/misc/url-scan.c                        |    2 -
 camel/tests/misc/url.c                             |    2 -
 camel/tests/misc/utf7.c                            |    2 -
 camel/tests/smime/pgp-mime.c                       |    5 -
 camel/tests/smime/pgp.c                            |    3 -
 camel/tests/smime/pkcs7.c                          |    2 -
 camel/tests/stream/test1.c                         |    2 -
 camel/tests/stream/test2.c                         |    2 -
 camel/tests/stream/test3.c                         |    4 -
 docs/reference/camel/tmpl/camel-address.sgml       |    3 -
 docs/reference/camel/tmpl/camel-block-file.sgml    |   19 -
 docs/reference/camel/tmpl/camel-certdb.sgml        |   10 -
 .../reference/camel/tmpl/camel-cipher-context.sgml |    7 +-
 docs/reference/camel/tmpl/camel-data-cache.sgml    |    7 +-
 docs/reference/camel/tmpl/camel-data-wrapper.sgml  |    6 -
 docs/reference/camel/tmpl/camel-disco-diary.sgml   |    5 -
 docs/reference/camel/tmpl/camel-disco-folder.sgml  |    2 -
 docs/reference/camel/tmpl/camel-disco-store.sgml   |    3 -
 docs/reference/camel/tmpl/camel-filter-driver.sgml |    2 -
 docs/reference/camel/tmpl/camel-folder-search.sgml |   10 -
 .../reference/camel/tmpl/camel-folder-summary.sgml |   27 -
 docs/reference/camel/tmpl/camel-folder.sgml        |   10 -
 docs/reference/camel/tmpl/camel-gpg-context.sgml   |    7 +-
 docs/reference/camel/tmpl/camel-html-parser.sgml   |    2 -
 docs/reference/camel/tmpl/camel-http-stream.sgml   |   14 -
 docs/reference/camel/tmpl/camel-imap4-command.sgml |  141 ---
 docs/reference/camel/tmpl/camel-imap4-engine.sgml  |  299 ------
 docs/reference/camel/tmpl/camel-imap4-folder.sgml  |   34 -
 docs/reference/camel/tmpl/camel-imap4-journal.sgml |   46 -
 docs/reference/camel/tmpl/camel-imap4-search.sgml  |   24 -
 .../reference/camel/tmpl/camel-imap4-specials.sgml |   56 --
 .../camel/tmpl/camel-imap4-store-summary.sgml      |   73 --
 docs/reference/camel/tmpl/camel-imap4-store.sgml   |   10 -
 docs/reference/camel/tmpl/camel-imap4-stream.sgml  |   93 --
 docs/reference/camel/tmpl/camel-imap4-summary.sgml |  109 ---
 docs/reference/camel/tmpl/camel-imap4-utils.sgml   |  185 ----
 docs/reference/camel/tmpl/camel-index.sgml         |   17 -
 .../camel/tmpl/camel-internet-address.sgml         |    2 -
 docs/reference/camel/tmpl/camel-medium.sgml        |    7 +-
 .../camel/tmpl/camel-mime-filter-basic.sgml        |    2 -
 .../camel/tmpl/camel-mime-filter-bestenc.sgml      |    2 -
 .../camel/tmpl/camel-mime-filter-canon.sgml        |    2 -
 .../camel/tmpl/camel-mime-filter-charset.sgml      |    2 -
 .../camel/tmpl/camel-mime-filter-crlf.sgml         |    2 -
 .../camel/tmpl/camel-mime-filter-enriched.sgml     |    2 -
 .../camel/tmpl/camel-mime-filter-from.sgml         |    2 -
 .../camel/tmpl/camel-mime-filter-gzip.sgml         |    2 -
 .../camel/tmpl/camel-mime-filter-html.sgml         |    2 -
 .../camel/tmpl/camel-mime-filter-index.sgml        |    2 -
 .../camel/tmpl/camel-mime-filter-linewrap.sgml     |    2 -
 .../camel/tmpl/camel-mime-filter-pgp.sgml          |    2 -
 .../camel/tmpl/camel-mime-filter-progress.sgml     |    2 -
 .../camel/tmpl/camel-mime-filter-save.sgml         |    2 -
 .../camel/tmpl/camel-mime-filter-tohtml.sgml       |    2 -
 .../camel/tmpl/camel-mime-filter-windows.sgml      |    2 -
 .../camel/tmpl/camel-mime-filter-yenc.sgml         |    2 -
 docs/reference/camel/tmpl/camel-mime-filter.sgml   |   10 -
 docs/reference/camel/tmpl/camel-mime-message.sgml  |   10 -
 docs/reference/camel/tmpl/camel-mime-parser.sgml   |    2 -
 docs/reference/camel/tmpl/camel-mime-part.sgml     |   29 +-
 .../camel/tmpl/camel-multipart-encrypted.sgml      |    5 -
 .../camel/tmpl/camel-multipart-signed.sgml         |   10 -
 docs/reference/camel/tmpl/camel-multipart.sgml     |    4 -
 docs/reference/camel/tmpl/camel-nntp-address.sgml  |    2 -
 docs/reference/camel/tmpl/camel-object.sgml        |    7 -
 .../reference/camel/tmpl/camel-offline-folder.sgml |    2 -
 .../camel/tmpl/camel-offline-journal.sgml          |    4 -
 docs/reference/camel/tmpl/camel-offline-store.sgml |    2 -
 .../camel/tmpl/camel-partition-table.sgml          |   13 -
 .../reference/camel/tmpl/camel-sasl-anonymous.sgml |    3 -
 docs/reference/camel/tmpl/camel-sasl-cram-md5.sgml |    2 -
 .../camel/tmpl/camel-sasl-digest-md5.sgml          |    2 -
 docs/reference/camel/tmpl/camel-sasl-gssapi.sgml   |    2 -
 docs/reference/camel/tmpl/camel-sasl-login.sgml    |    2 -
 docs/reference/camel/tmpl/camel-sasl-ntlm.sgml     |    2 -
 docs/reference/camel/tmpl/camel-sasl-plain.sgml    |    2 -
 .../reference/camel/tmpl/camel-sasl-popb4smtp.sgml |    2 -
 docs/reference/camel/tmpl/camel-sasl.sgml          |   22 +-
 .../camel/tmpl/camel-seekable-stream.sgml          |    4 -
 .../camel/tmpl/camel-seekable-substream.sgml       |    2 -
 docs/reference/camel/tmpl/camel-service.sgml       |    7 -
 docs/reference/camel/tmpl/camel-session.sgml       |    7 -
 docs/reference/camel/tmpl/camel-smime-context.sgml |    2 -
 docs/reference/camel/tmpl/camel-store-summary.sgml |   12 -
 docs/reference/camel/tmpl/camel-store.sgml         |    8 -
 docs/reference/camel/tmpl/camel-stream-buffer.sgml |   10 -
 docs/reference/camel/tmpl/camel-stream-filter.sgml |    3 -
 docs/reference/camel/tmpl/camel-stream-fs.sgml     |    2 -
 docs/reference/camel/tmpl/camel-stream-mem.sgml    |    4 -
 docs/reference/camel/tmpl/camel-stream-null.sgml   |    2 -
 .../reference/camel/tmpl/camel-stream-process.sgml |    3 -
 docs/reference/camel/tmpl/camel-stream-vfs.sgml    |    2 -
 docs/reference/camel/tmpl/camel-stream.sgml        |    2 -
 .../reference/camel/tmpl/camel-tcp-stream-raw.sgml |    3 -
 .../reference/camel/tmpl/camel-tcp-stream-ssl.sgml |    2 -
 docs/reference/camel/tmpl/camel-tcp-stream.sgml    |    1 -
 docs/reference/camel/tmpl/camel-text-index.sgml    |    8 -
 docs/reference/camel/tmpl/camel-transport.sgml     |    2 -
 docs/reference/camel/tmpl/camel-unused.sgml        |  989 ++++++++++++++++++++
 docs/reference/camel/tmpl/camel-vee-folder.sgml    |   10 -
 docs/reference/camel/tmpl/camel-vee-store.sgml     |    3 -
 docs/reference/camel/tmpl/camel-vee-summary.sgml   |    3 -
 docs/reference/camel/tmpl/camel-vtrash-folder.sgml |    3 -
 po/POTFILES.in                                     |   13 -
 138 files changed, 1060 insertions(+), 1633 deletions(-)
---
diff --git a/camel/tests/folder/test1.c b/camel/tests/folder/test1.c
index 6261b1d..87684eb 100644
--- a/camel/tests/folder/test1.c
+++ b/camel/tests/folder/test1.c
@@ -5,10 +5,6 @@
 #include "folders.h"
 #include "session.h"
 
-#include <camel/camel-exception.h>
-#include <camel/camel-service.h>
-#include <camel/camel-store.h>
-
 static const gchar *local_drivers[] = {
 	"local"
 };
diff --git a/camel/tests/folder/test10.c b/camel/tests/folder/test10.c
index 2c980b5..b56c707 100644
--- a/camel/tests/folder/test10.c
+++ b/camel/tests/folder/test10.c
@@ -9,10 +9,6 @@
 #include "messages.h"
 #include "session.h"
 
-#include <camel/camel-exception.h>
-#include <camel/camel-service.h>
-#include <camel/camel-store.h>
-
 #define MAX_LOOP (10000)
 #define MAX_THREADS (5)
 
diff --git a/camel/tests/folder/test11.c b/camel/tests/folder/test11.c
index fe20aaf..8ef40f9 100644
--- a/camel/tests/folder/test11.c
+++ b/camel/tests/folder/test11.c
@@ -8,10 +8,6 @@
 #include "camel-test-provider.h"
 #include "session.h"
 
-#include <camel/camel-exception.h>
-#include <camel/camel-service.h>
-#include <camel/camel-store.h>
-
 #define MAX_LOOP (10000)
 #define MAX_THREADS (5)
 
diff --git a/camel/tests/folder/test2.c b/camel/tests/folder/test2.c
index a7c07cc..3ab9043 100644
--- a/camel/tests/folder/test2.c
+++ b/camel/tests/folder/test2.c
@@ -10,14 +10,6 @@
 #include "folders.h"
 #include "session.h"
 
-#include <camel/camel-exception.h>
-#include <camel/camel-service.h>
-#include <camel/camel-store.h>
-
-#include <camel/camel-folder.h>
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-mime-message.h>
-
 static const gchar *local_drivers[] = { "local" };
 
 static gchar *stores[] = {
diff --git a/camel/tests/folder/test3.c b/camel/tests/folder/test3.c
index 97fb0c6..b34db78 100644
--- a/camel/tests/folder/test3.c
+++ b/camel/tests/folder/test3.c
@@ -8,14 +8,6 @@
 #include "folders.h"
 #include "session.h"
 
-#include <camel/camel-exception.h>
-#include <camel/camel-service.h>
-#include <camel/camel-store.h>
-
-#include <camel/camel-folder.h>
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-mime-message.h>
-
 static void
 test_folder_search_sub(CamelFolder *folder, const gchar *expr, gint expected)
 {
diff --git a/camel/tests/folder/test4.c b/camel/tests/folder/test4.c
index 411b0c5..875707e 100644
--- a/camel/tests/folder/test4.c
+++ b/camel/tests/folder/test4.c
@@ -5,10 +5,6 @@
 #include "folders.h"
 #include "session.h"
 
-#include <camel/camel-exception.h>
-#include <camel/camel-service.h>
-#include <camel/camel-store.h>
-
 static const gchar *imap_drivers[] = { "imap4" };
 
 static gchar *remote_providers[] = {
diff --git a/camel/tests/folder/test5.c b/camel/tests/folder/test5.c
index f2a0a8f..0d38027 100644
--- a/camel/tests/folder/test5.c
+++ b/camel/tests/folder/test5.c
@@ -5,10 +5,6 @@
 #include "folders.h"
 #include "session.h"
 
-#include <camel/camel-exception.h>
-#include <camel/camel-service.h>
-#include <camel/camel-store.h>
-
 static const gchar *nntp_drivers[] = { "nntp" };
 
 static gchar *remote_providers[] = {
diff --git a/camel/tests/folder/test6.c b/camel/tests/folder/test6.c
index 900a87b..6af5dea 100644
--- a/camel/tests/folder/test6.c
+++ b/camel/tests/folder/test6.c
@@ -5,14 +5,6 @@
 #include "folders.h"
 #include "session.h"
 
-#include <camel/camel-exception.h>
-#include <camel/camel-service.h>
-#include <camel/camel-store.h>
-
-#include <camel/camel-folder.h>
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-mime-message.h>
-
 static const gchar *imap_drivers[] = { "imap4" };
 static gchar *remote_providers[] = {
 	"IMAP_TEST_URL",
diff --git a/camel/tests/folder/test7.c b/camel/tests/folder/test7.c
index 7dec571..5e99fe3 100644
--- a/camel/tests/folder/test7.c
+++ b/camel/tests/folder/test7.c
@@ -6,14 +6,6 @@
 #include "messages.h"
 #include "session.h"
 
-#include <camel/camel-exception.h>
-#include <camel/camel-service.h>
-#include <camel/camel-store.h>
-
-#include <camel/camel-folder.h>
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-mime-message.h>
-
 static const gchar *nntp_drivers[] = { "nntp" };
 static gchar *remote_providers[] = {
 	"NNTP_TEST_URL",
diff --git a/camel/tests/folder/test8.c b/camel/tests/folder/test8.c
index aef6d93..17e7902 100644
--- a/camel/tests/folder/test8.c
+++ b/camel/tests/folder/test8.c
@@ -9,10 +9,6 @@
 #include "messages.h"
 #include "session.h"
 
-#include <camel/camel-exception.h>
-#include <camel/camel-service.h>
-#include <camel/camel-store.h>
-
 #define MAX_MESSAGES (100)
 #define MAX_THREADS (10)
 
diff --git a/camel/tests/folder/test9.c b/camel/tests/folder/test9.c
index 326064c..fdc8ea6 100644
--- a/camel/tests/folder/test9.c
+++ b/camel/tests/folder/test9.c
@@ -8,16 +8,6 @@
 #include "folders.h"
 #include "session.h"
 
-#include "camel/camel-exception.h"
-#include "camel/camel-service.h"
-#include "camel/camel-store.h"
-
-#include "camel/camel-folder.h"
-#include "camel/camel-folder-summary.h"
-#include "camel/camel-mime-message.h"
-#include "camel/camel-filter-driver.h"
-#include "camel/camel-stream-fs.h"
-
 static const gchar *local_drivers[] = { "local" };
 
 struct {
diff --git a/camel/tests/lib/addresses.h b/camel/tests/lib/addresses.h
index dc35a19..4bb11e9 100644
--- a/camel/tests/lib/addresses.h
+++ b/camel/tests/lib/addresses.h
@@ -1,5 +1,4 @@
-
-#include <camel/camel-internet-address.h>
+#include <camel/camel.h>
 
 /* addresses.c */
 void test_address_compare(CamelInternetAddress *addr, CamelInternetAddress *addr2);
diff --git a/camel/tests/lib/camel-test-provider.c b/camel/tests/lib/camel-test-provider.c
index 03e13f6..29a4076 100644
--- a/camel/tests/lib/camel-test-provider.c
+++ b/camel/tests/lib/camel-test-provider.c
@@ -1,9 +1,5 @@
 
-#include "camel-test-provider.h"
 #include "camel-test.h"
-#include "camel-exception.h"
-
-#include "camel-provider.h"
 
 void camel_test_provider_init(gint argc, gchar **argv)
 {
diff --git a/camel/tests/lib/camel-test.c b/camel/tests/lib/camel-test.c
index 9cf38a6..fa0aaa8 100644
--- a/camel/tests/lib/camel-test.c
+++ b/camel/tests/lib/camel-test.c
@@ -10,8 +10,6 @@
 #include <signal.h>
 #include <errno.h>
 
-#include <camel/camel.h>
-
 /* well i dunno, doesn't seem to be in the headers but hte manpage mentions it */
 /* a nonportable checking mutex for glibc, not really needed, just validates
    the test harness really */
diff --git a/camel/tests/lib/camel-test.h b/camel/tests/lib/camel-test.h
index facd942..e942a95 100644
--- a/camel/tests/lib/camel-test.h
+++ b/camel/tests/lib/camel-test.h
@@ -4,7 +4,7 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <glib.h>
+#include <camel/camel.h>
 
 void camel_test_failv(const gchar *why, va_list ap);
 
diff --git a/camel/tests/lib/folders.c b/camel/tests/lib/folders.c
index aaae49e..da659a3 100644
--- a/camel/tests/lib/folders.c
+++ b/camel/tests/lib/folders.c
@@ -4,8 +4,6 @@
 #include "folders.h"
 #include "messages.h"
 
-#include "camel/camel-exception.h"
-
 /* check the total/unread is what we think it should be */
 void
 test_folder_counts(CamelFolder *folder, gint total, gint unread)
diff --git a/camel/tests/lib/folders.h b/camel/tests/lib/folders.h
index de2fb10..07d8bba 100644
--- a/camel/tests/lib/folders.h
+++ b/camel/tests/lib/folders.h
@@ -1,11 +1,4 @@
 
-#include "camel/camel-session.h"
-#include "camel/camel-store.h"
-
-#include <camel/camel-folder.h>
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-mime-message.h>
-
 /* check the total/unread is what we think it should be, everywhere it can be determined */
 void test_folder_counts(CamelFolder *folder, gint total, gint unread);
 /* cross-check info/msg */
diff --git a/camel/tests/lib/messages.c b/camel/tests/lib/messages.c
index af003bc..3060ee1 100644
--- a/camel/tests/lib/messages.c
+++ b/camel/tests/lib/messages.c
@@ -5,11 +5,6 @@
 #include "messages.h"
 #include "camel-test.h"
 
-#include <camel/camel-multipart.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-mem.h>
-
 CamelMimeMessage *
 test_message_create_simple(void)
 {
diff --git a/camel/tests/lib/messages.h b/camel/tests/lib/messages.h
index 6b4d560..807ba74 100644
--- a/camel/tests/lib/messages.h
+++ b/camel/tests/lib/messages.h
@@ -1,5 +1,4 @@
-
-#include <camel/camel-mime-message.h>
+#include <camel/camel.h>
 
 /* how many ways to set the content contents */
 #define SET_CONTENT_WAYS (5)
diff --git a/camel/tests/lib/session.h b/camel/tests/lib/session.h
index 5d11453..b0a1204 100644
--- a/camel/tests/lib/session.h
+++ b/camel/tests/lib/session.h
@@ -1,4 +1,4 @@
-#include <camel/camel-session.h>
+#include <camel/camel.h>
 
 #define CAMEL_TEST_SESSION_TYPE     (camel_test_session_get_type ())
 #define CAMEL_TEST_SESSION(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TEST_SESSION_TYPE, CamelTestSession))
diff --git a/camel/tests/lib/streams.c b/camel/tests/lib/streams.c
index cc1e5d1..266a61b 100644
--- a/camel/tests/lib/streams.c
+++ b/camel/tests/lib/streams.c
@@ -7,10 +7,6 @@
 
 #include <string.h>
 
-#include "camel/camel-stream.h"
-#include "camel/camel-seekable-stream.h"
-#include "camel/camel-seekable-substream.h"
-
 #include "streams.h"
 
 #include "camel-test.h"
diff --git a/camel/tests/lib/streams.h b/camel/tests/lib/streams.h
index aac9a80..8a82009 100644
--- a/camel/tests/lib/streams.h
+++ b/camel/tests/lib/streams.h
@@ -1,5 +1,4 @@
-
-#include "camel/camel-seekable-stream.h"
+#include <camel/camel.h>
 
 /* call one, then the other on the same stream content */
 void test_stream_seekable_writepart(CamelSeekableStream *s);
diff --git a/camel/tests/message/test1.c b/camel/tests/message/test1.c
index c122f5c..4b088d3 100644
--- a/camel/tests/message/test1.c
+++ b/camel/tests/message/test1.c
@@ -25,10 +25,6 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <camel/camel-mime-message.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-mem.h>
-
 struct _text {
 	gchar *text;
 	gint len;
diff --git a/camel/tests/message/test2.c b/camel/tests/message/test2.c
index f72290d..8b691ad 100644
--- a/camel/tests/message/test2.c
+++ b/camel/tests/message/test2.c
@@ -9,9 +9,6 @@
 #include <stdio.h>
 #include <iconv.h>
 
-#include <camel/camel-internet-address.h>
-#include <camel/camel-address.h>
-
 #include "address-data.h"
 
 static gchar *convert(const gchar *in, const gchar *from, const gchar *to)
diff --git a/camel/tests/message/test3.c b/camel/tests/message/test3.c
index 2031eab..568d436 100644
--- a/camel/tests/message/test3.c
+++ b/camel/tests/message/test3.c
@@ -10,11 +10,6 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <camel/camel-mime-message.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-mem.h>
-#include "camel/camel-multipart.h"
-
 gint main(gint argc, gchar **argv)
 {
 	CamelMimeMessage *msg, *msg2, *msg3;
diff --git a/camel/tests/message/test4.c b/camel/tests/message/test4.c
index 3b21070..835bc3f 100644
--- a/camel/tests/message/test4.c
+++ b/camel/tests/message/test4.c
@@ -30,11 +30,6 @@
 #include "camel-test.h"
 #include "messages.h"
 
-#include <camel/camel-multipart.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-mem.h>
-
 #if 0
 static void
 dump_mime_struct (CamelMimePart *mime_part, gint depth)
diff --git a/camel/tests/mime-filter/test-charset.c b/camel/tests/mime-filter/test-charset.c
index 60aaffb..e859260 100644
--- a/camel/tests/mime-filter/test-charset.c
+++ b/camel/tests/mime-filter/test-charset.c
@@ -11,11 +11,6 @@
 
 #include "camel-test.h"
 
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-mime-filter-charset.h>
-
 #define d(x)
 
 #define CHUNK_SIZE 4096
@@ -68,7 +63,7 @@ main (gint argc, gchar **argv)
 		}
 		g_free (outfile);
 
-		if (!(filter = camel_stream_filter_new_with_stream (CAMEL_STREAM (source)))) {
+		if (!(filter = camel_stream_filter_new (CAMEL_STREAM (source)))) {
 			camel_test_fail ("Couldn't create CamelStreamFilter??");
 			continue;
 		}
@@ -77,7 +72,7 @@ main (gint argc, gchar **argv)
 		ext = strchr (charset, '.');
 		*((gchar *) ext) = '\0';
 
-		if (!(f = (CamelMimeFilter *) camel_mime_filter_charset_new_convert (charset, "UTF-8"))) {
+		if (!(f = (CamelMimeFilter *) camel_mime_filter_charset_new (charset, "UTF-8"))) {
 			camel_test_fail ("Couldn't create CamelMimeFilterCharset??");
 			g_free (charset);
 			continue;
diff --git a/camel/tests/mime-filter/test-crlf.c b/camel/tests/mime-filter/test-crlf.c
index e87a1a6..602c934 100644
--- a/camel/tests/mime-filter/test-crlf.c
+++ b/camel/tests/mime-filter/test-crlf.c
@@ -9,11 +9,6 @@
 
 #include "camel-test.h"
 
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-mime-filter-crlf.h>
-
 #define d(x)
 
 #define NUM_CASES 1
@@ -85,7 +80,7 @@ main (gint argc, gchar **argv)
 			}
 			g_free (outfile);
 
-			filter = camel_stream_filter_new_with_stream (CAMEL_STREAM (source));
+			filter = camel_stream_filter_new (CAMEL_STREAM (source));
 			if (!filter) {
 				camel_test_fail ("Couldn't create CamelStreamFilter??");
 				continue;
diff --git a/camel/tests/mime-filter/test-tohtml.c b/camel/tests/mime-filter/test-tohtml.c
index 2495a95..7327605 100644
--- a/camel/tests/mime-filter/test-tohtml.c
+++ b/camel/tests/mime-filter/test-tohtml.c
@@ -14,11 +14,6 @@
 
 #include "camel-test.h"
 
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-mime-filter-tohtml.h>
-
 #define d(x)
 
 #define CHUNK_SIZE 4096
@@ -48,7 +43,7 @@ test_filter(CamelMimeFilter *f, const gchar *inname, const gchar *outname)
 
 	in = (CamelStreamMem *)camel_stream_mem_new();
 
-	filter = (CamelStream *)camel_stream_filter_new_with_stream(indisk);
+	filter = (CamelStream *)camel_stream_filter_new (indisk);
 	check_count(indisk, 2);
 	id = camel_stream_filter_add((CamelStreamFilter *)filter, f);
 	check_count(f, 2);
@@ -75,7 +70,7 @@ test_filter(CamelMimeFilter *f, const gchar *inname, const gchar *outname)
 	camel_test_push("writing through filter stream");
 
 	in = (CamelStreamMem *)camel_stream_mem_new();
-	filter = (CamelStream *)camel_stream_filter_new_with_stream((CamelStream *)in);
+	filter = (CamelStream *)camel_stream_filter_new ((CamelStream *)in);
 	check_count(in, 2);
 	id = camel_stream_filter_add((CamelStreamFilter *)filter, f);
 	check_count(f, 2);
diff --git a/camel/tests/mime-filter/test1.c b/camel/tests/mime-filter/test1.c
index 93bfb9e..aa0f219 100644
--- a/camel/tests/mime-filter/test1.c
+++ b/camel/tests/mime-filter/test1.c
@@ -9,11 +9,6 @@
 
 #include "camel-test.h"
 
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-mime-filter-canon.h>
-
 #define d(x)
 
 #define NUM_CASES 1
@@ -77,7 +72,7 @@ main (gint argc, gchar **argv)
 			camel_test_push("Chunk size %d\n", step);
 
 			out = (CamelStreamMem *)camel_stream_mem_new();
-			filter = camel_stream_filter_new_with_stream((CamelStream *)out);
+			filter = camel_stream_filter_new ((CamelStream *)out);
 			sh = camel_mime_filter_canon_new(tests[i].flags);
 			check(camel_stream_filter_add(filter, sh) != -1);
 			check_unref(sh, 2);
diff --git a/camel/tests/misc/rfc2047.c b/camel/tests/misc/rfc2047.c
index d970e37..c12aba1 100644
--- a/camel/tests/misc/rfc2047.c
+++ b/camel/tests/misc/rfc2047.c
@@ -28,8 +28,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <camel/camel-object.h>
-#include <camel/camel-mime-utils.h>
 
 #include "camel-test.h"
 
diff --git a/camel/tests/misc/split.c b/camel/tests/misc/split.c
index 4034404..8c87bd9 100644
--- a/camel/tests/misc/split.c
+++ b/camel/tests/misc/split.c
@@ -5,7 +5,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <camel/camel-exception.h>
 #include <camel/camel-search-private.h>
 
 #include "camel-test.h"
diff --git a/camel/tests/misc/test1.c b/camel/tests/misc/test1.c
index dc6affd..b5f6fd5 100644
--- a/camel/tests/misc/test1.c
+++ b/camel/tests/misc/test1.c
@@ -4,8 +4,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <camel/camel-object.h>
-#include <camel/camel-mime-utils.h>
 
 #include "camel-test.h"
 
diff --git a/camel/tests/misc/test2.c b/camel/tests/misc/test2.c
index 7bc372d..e4d6f66 100644
--- a/camel/tests/misc/test2.c
+++ b/camel/tests/misc/test2.c
@@ -5,8 +5,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <camel/camel-object.h>
-#include <camel/camel-mime-utils.h>
 
 #include "camel-test.h"
 
diff --git a/camel/tests/misc/url-scan.c b/camel/tests/misc/url-scan.c
index 3cc3fcd..9476526 100644
--- a/camel/tests/misc/url-scan.c
+++ b/camel/tests/misc/url-scan.c
@@ -28,8 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <camel/camel-mime-filter-tohtml.h>
-
 #include "camel-test.h"
 
 struct {
diff --git a/camel/tests/misc/url.c b/camel/tests/misc/url.c
index 207e0fb..dcdb06f 100644
--- a/camel/tests/misc/url.c
+++ b/camel/tests/misc/url.c
@@ -4,8 +4,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <camel/camel-url.h>
-#include <camel/camel-exception.h>
 
 #include "camel-test.h"
 
diff --git a/camel/tests/misc/utf7.c b/camel/tests/misc/utf7.c
index 45d8d7b..b4d439c 100644
--- a/camel/tests/misc/utf7.c
+++ b/camel/tests/misc/utf7.c
@@ -5,8 +5,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <camel/camel-utf8.h>
-#include <camel/camel-exception.h>
 
 #include "camel-test.h"
 
diff --git a/camel/tests/smime/pgp-mime.c b/camel/tests/smime/pgp-mime.c
index 8ba1603..3e6870a 100644
--- a/camel/tests/smime/pgp-mime.c
+++ b/camel/tests/smime/pgp-mime.c
@@ -28,11 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/wait.h>
-#include <camel/camel-gpg-context.h>
-#include <camel/camel-multipart-signed.h>
-#include <camel/camel-multipart-encrypted.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-stream-mem.h>
 
 #include "camel-test.h"
 #include "session.h"
diff --git a/camel/tests/smime/pgp.c b/camel/tests/smime/pgp.c
index 60d57dd..efe8772 100644
--- a/camel/tests/smime/pgp.c
+++ b/camel/tests/smime/pgp.c
@@ -28,9 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/wait.h>
-#include <camel/camel-gpg-context.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-mime-part.h>
 
 #include "camel-test.h"
 #include "session.h"
diff --git a/camel/tests/smime/pkcs7.c b/camel/tests/smime/pkcs7.c
index ca9f270..73dc143 100644
--- a/camel/tests/smime/pkcs7.c
+++ b/camel/tests/smime/pkcs7.c
@@ -3,8 +3,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <camel/camel-smime-context.h>
-#include <camel/camel-stream-mem.h>
 
 #include "camel-test.h"
 
diff --git a/camel/tests/stream/test1.c b/camel/tests/stream/test1.c
index eea05f8..39068b7 100644
--- a/camel/tests/stream/test1.c
+++ b/camel/tests/stream/test1.c
@@ -8,8 +8,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "camel/camel-stream-fs.h"
-
 gint main(gint argc, gchar **argv)
 {
 	CamelSeekableStream *ss = NULL;
diff --git a/camel/tests/stream/test2.c b/camel/tests/stream/test2.c
index 5ef0fc0..22ab779 100644
--- a/camel/tests/stream/test2.c
+++ b/camel/tests/stream/test2.c
@@ -8,8 +8,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "camel/camel-stream-mem.h"
-
 gint main(gint argc, gchar **argv)
 {
 	CamelSeekableStream *ss = NULL;
diff --git a/camel/tests/stream/test3.c b/camel/tests/stream/test3.c
index d11015d..0f48fca 100644
--- a/camel/tests/stream/test3.c
+++ b/camel/tests/stream/test3.c
@@ -8,10 +8,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "camel/camel-stream-mem.h"
-#include "camel/camel-stream-fs.h"
-#include "camel/camel-seekable-substream.h"
-
 struct {
 	off_t lower, upper;
 } ranges[] = {
diff --git a/docs/reference/camel/tmpl/camel-address.sgml b/docs/reference/camel/tmpl/camel-address.sgml
index be2f32a..677b3cd 100644
--- a/docs/reference/camel/tmpl/camel-address.sgml
+++ b/docs/reference/camel/tmpl/camel-address.sgml
@@ -22,9 +22,6 @@ CamelAddress
 
 </para>
 
- parent: 
- addresses: 
- priv: 
 
 <!-- ##### FUNCTION camel_address_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-block-file.sgml b/docs/reference/camel/tmpl/camel-block-file.sgml
index 454f9d4..cf08d27 100644
--- a/docs/reference/camel/tmpl/camel-block-file.sgml
+++ b/docs/reference/camel/tmpl/camel-block-file.sgml
@@ -58,19 +58,6 @@ CamelKeyFile
 
 </para>
 
- parent: 
- priv: 
- version: 
- path: 
- flags: 
- fd: 
- block_size: 
- root: 
- root_block: 
- block_cache_limit: 
- block_cache_count: 
- block_cache: 
- blocks: 
 
 <!-- ##### MACRO CAMEL_BLOCK_FILE_SYNC ##### -->
 <para>
@@ -227,12 +214,6 @@ CamelKeyFile
 
 </para>
 
- parent: 
- priv: 
- fp: 
- path: 
- flags: 
- last: 
 
 <!-- ##### FUNCTION camel_key_file_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-certdb.sgml b/docs/reference/camel/tmpl/camel-certdb.sgml
index 85522c8..810718e 100644
--- a/docs/reference/camel/tmpl/camel-certdb.sgml
+++ b/docs/reference/camel/tmpl/camel-certdb.sgml
@@ -22,16 +22,6 @@ CamelCertDB
 
 </para>
 
- parent: 
- priv: 
- filename: 
- version: 
- saved_certs: 
- flags: 
- cert_size: 
- cert_chunks: 
- certs: 
- cert_hash: 
 
 <!-- ##### ENUM CamelCertTrust ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-cipher-context.sgml b/docs/reference/camel/tmpl/camel-cipher-context.sgml
index 14db85e..44a677c 100644
--- a/docs/reference/camel/tmpl/camel-cipher-context.sgml
+++ b/docs/reference/camel/tmpl/camel-cipher-context.sgml
@@ -22,8 +22,11 @@ CamelCipherContext
 
 </para>
 
- parent: 
- priv: 
+
+<!-- ##### ARG CamelCipherContext:session ##### -->
+<para>
+
+</para>
 
 <!-- ##### STRUCT CamelCipherValidity ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-data-cache.sgml b/docs/reference/camel/tmpl/camel-data-cache.sgml
index 5f14ce7..dc727f5 100644
--- a/docs/reference/camel/tmpl/camel-data-cache.sgml
+++ b/docs/reference/camel/tmpl/camel-data-cache.sgml
@@ -22,8 +22,11 @@ CamelDataCache
 
 </para>
 
- parent: 
- priv: 
+
+<!-- ##### ARG CamelDataCache:path ##### -->
+<para>
+
+</para>
 
 <!-- ##### FUNCTION camel_data_cache_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-data-wrapper.sgml b/docs/reference/camel/tmpl/camel-data-wrapper.sgml
index ffcde75..11144cc 100644
--- a/docs/reference/camel/tmpl/camel-data-wrapper.sgml
+++ b/docs/reference/camel/tmpl/camel-data-wrapper.sgml
@@ -22,12 +22,6 @@ CamelDataWrapper
 
 </para>
 
- parent: 
- priv: 
- encoding: 
- mime_type: 
- stream: 
- offline: 
 
 <!-- ##### FUNCTION camel_data_wrapper_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-disco-diary.sgml b/docs/reference/camel/tmpl/camel-disco-diary.sgml
index 9dbc6ae..2114195 100644
--- a/docs/reference/camel/tmpl/camel-disco-diary.sgml
+++ b/docs/reference/camel/tmpl/camel-disco-diary.sgml
@@ -22,11 +22,6 @@ CamelDiscoDiary
 
 </para>
 
- parent: 
- store: 
- file: 
- folders: 
- uidmap: 
 
 <!-- ##### ENUM CamelDiscoDiaryAction ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-disco-folder.sgml b/docs/reference/camel/tmpl/camel-disco-folder.sgml
index 88fb38f..1635928 100644
--- a/docs/reference/camel/tmpl/camel-disco-folder.sgml
+++ b/docs/reference/camel/tmpl/camel-disco-folder.sgml
@@ -22,8 +22,6 @@ CamelDiscoFolder
 
 </para>
 
- parent: 
- offline_sync: 
 
 <!-- ##### FUNCTION camel_disco_folder_expunge_uids ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-disco-store.sgml b/docs/reference/camel/tmpl/camel-disco-store.sgml
index 7bfafd2..ea7c191 100644
--- a/docs/reference/camel/tmpl/camel-disco-store.sgml
+++ b/docs/reference/camel/tmpl/camel-disco-store.sgml
@@ -22,9 +22,6 @@ CamelDiscoStore
 
 </para>
 
- parent: 
- status: 
- diary: 
 
 <!-- ##### ENUM CamelDiscoStoreStatus ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-filter-driver.sgml b/docs/reference/camel/tmpl/camel-filter-driver.sgml
index b46e6f2..7ab976c 100644
--- a/docs/reference/camel/tmpl/camel-filter-driver.sgml
+++ b/docs/reference/camel/tmpl/camel-filter-driver.sgml
@@ -22,8 +22,6 @@ CamelFilterDriver
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### USER_FUNCTION CamelFilterGetFolderFunc ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-folder-search.sgml b/docs/reference/camel/tmpl/camel-folder-search.sgml
index b3ea24a..8ba597c 100644
--- a/docs/reference/camel/tmpl/camel-folder-search.sgml
+++ b/docs/reference/camel/tmpl/camel-folder-search.sgml
@@ -22,16 +22,6 @@ CamelFolderSearch
 
 </para>
 
- parent: 
- priv: 
- sexp: 
- last_search: 
- folder: 
- summary: 
- summary_set: 
- current: 
- current_message: 
- body_index: 
 
 <!-- ##### FUNCTION camel_folder_search_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-folder-summary.sgml b/docs/reference/camel/tmpl/camel-folder-summary.sgml
index 1269637..832c45f 100644
--- a/docs/reference/camel/tmpl/camel-folder-summary.sgml
+++ b/docs/reference/camel/tmpl/camel-folder-summary.sgml
@@ -22,33 +22,6 @@ CamelFolderSummary
 
 </para>
 
- parent: 
- priv: 
- version: 
- flags: 
- nextuid: 
- time: 
- saved_count: 
- unread_count: 
- deleted_count: 
- junk_count: 
- junk_not_deleted_count: 
- visible_count: 
- message_info_size: 
- content_info_size: 
- message_info_chunks: 
- content_info_chunks: 
- summary_path: 
- build_content: 
- uids: 
- loaded_infos: 
- folder: 
- meta_summary: 
- cache_load_time: 
- timeout_handle: 
- collate: 
- sort_by: 
- later: 
 
 <!-- ##### STRUCT CamelMessageInfo ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-folder.sgml b/docs/reference/camel/tmpl/camel-folder.sgml
index e315a40..e47dea6 100644
--- a/docs/reference/camel/tmpl/camel-folder.sgml
+++ b/docs/reference/camel/tmpl/camel-folder.sgml
@@ -22,16 +22,6 @@ CamelFolder
 
 </para>
 
- parent: 
- priv: 
- name: 
- full_name: 
- description: 
- parent_store: 
- summary: 
- folder_flags: 
- permanent_flags: 
- later: 
 
 <!-- ##### STRUCT CamelFolderChangeInfo ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-gpg-context.sgml b/docs/reference/camel/tmpl/camel-gpg-context.sgml
index 2282337..935a50a 100644
--- a/docs/reference/camel/tmpl/camel-gpg-context.sgml
+++ b/docs/reference/camel/tmpl/camel-gpg-context.sgml
@@ -22,8 +22,11 @@ CamelGpgContext
 
 </para>
 
- parent: 
- priv: 
+
+<!-- ##### ARG CamelGpgContext:always-trust ##### -->
+<para>
+
+</para>
 
 <!-- ##### FUNCTION camel_gpg_context_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-html-parser.sgml b/docs/reference/camel/tmpl/camel-html-parser.sgml
index 8cc957f..191b15b 100644
--- a/docs/reference/camel/tmpl/camel-html-parser.sgml
+++ b/docs/reference/camel/tmpl/camel-html-parser.sgml
@@ -22,8 +22,6 @@ CamelHTMLParser
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### ENUM camel_html_parser_t ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-http-stream.sgml b/docs/reference/camel/tmpl/camel-http-stream.sgml
index c5749a2..2885970 100644
--- a/docs/reference/camel/tmpl/camel-http-stream.sgml
+++ b/docs/reference/camel/tmpl/camel-http-stream.sgml
@@ -22,20 +22,6 @@ CamelHttpStream
 
 </para>
 
- parent: 
- parser: 
- content_type: 
- headers: 
- method: 
- session: 
- url: 
- user_agent: 
- proxy: 
- authrealm: 
- authpass: 
- statuscode: 
- raw: 
- read: 
 
 <!-- ##### ENUM CamelHttpMethod ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-imap4-command.sgml b/docs/reference/camel/tmpl/camel-imap4-command.sgml
index 4dba211..5646430 100644
--- a/docs/reference/camel/tmpl/camel-imap4-command.sgml
+++ b/docs/reference/camel/tmpl/camel-imap4-command.sgml
@@ -17,144 +17,3 @@ camel-imap4-command
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### STRUCT CamelIMAP4Command ##### -->
-<para>
-
-</para>
-
- node: 
- engine: 
- ref_count: 
- status: 
- result: 
- id: 
- tag: 
- resp_codes: 
- folder: 
- ex: 
- parts: 
- part: 
- untagged: 
- plus: 
- reset: 
- user_data: 
-
-<!-- ##### STRUCT CamelIMAP4Literal ##### -->
-<para>
-
-</para>
-
- type: 
-
-<!-- ##### USER_FUNCTION CamelIMAP4PlusCallback ##### -->
-<para>
-
-</para>
-
- engine: 
- ic: 
- linebuf: 
- linelen: 
- ex: 
- Returns: 
-
-
-<!-- ##### USER_FUNCTION CamelIMAP4UntaggedCallback ##### -->
-<para>
-
-</para>
-
- engine: 
- ic: 
- index: 
- token: 
- ex: 
- Returns: 
-
-
-<!-- ##### USER_FUNCTION CamelIMAP4CommandReset ##### -->
-<para>
-
-</para>
-
- ic: 
- user_data: 
-
-
-<!-- ##### STRUCT CamelIMAP4CommandPart ##### -->
-<para>
-
-</para>
-
- next: 
- buffer: 
- buflen: 
- literal: 
-
-<!-- ##### FUNCTION camel_imap4_command_new ##### -->
-<para>
-
-</para>
-
- engine: 
- folder: 
- format: 
- Varargs: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_command_newv ##### -->
-<para>
-
-</para>
-
- engine: 
- folder: 
- format: 
- args: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_command_register_untagged ##### -->
-<para>
-
-</para>
-
- ic: 
- atom: 
- untagged: 
-
-
-<!-- ##### FUNCTION camel_imap4_command_ref ##### -->
-<para>
-
-</para>
-
- ic: 
-
-
-<!-- ##### FUNCTION camel_imap4_command_unref ##### -->
-<para>
-
-</para>
-
- ic: 
-
-
-<!-- ##### FUNCTION camel_imap4_command_step ##### -->
-<para>
-
-</para>
-
- ic: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_command_reset ##### -->
-<para>
-
-</para>
-
- ic: 
-
-
diff --git a/docs/reference/camel/tmpl/camel-imap4-engine.sgml b/docs/reference/camel/tmpl/camel-imap4-engine.sgml
index e773c5c..5c23bd6 100644
--- a/docs/reference/camel/tmpl/camel-imap4-engine.sgml
+++ b/docs/reference/camel/tmpl/camel-imap4-engine.sgml
@@ -17,302 +17,3 @@ CamelIMAP4Engine
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### STRUCT CamelIMAP4Engine ##### -->
-<para>
-
-</para>
-
- parent: 
- reconnect: 
- reconnecting: 
- session: 
- service: 
- url: 
- state: 
- level: 
- capa: 
- maxlen: 
- maxlentype: 
- namespaces: 
- authtypes: 
- istream: 
- ostream: 
- tagprefix: 
- tag: 
- nextid: 
- folder: 
- queue: 
- current: 
-
-<!-- ##### ENUM camel_imap4_engine_t ##### -->
-<para>
-
-</para>
-
- CAMEL_IMAP4_ENGINE_DISCONNECTED: 
- CAMEL_IMAP4_ENGINE_CONNECTED: 
- CAMEL_IMAP4_ENGINE_PREAUTH: 
- CAMEL_IMAP4_ENGINE_AUTHENTICATED: 
- CAMEL_IMAP4_ENGINE_SELECTED: 
-
-<!-- ##### ENUM camel_imap4_level_t ##### -->
-<para>
-
-</para>
-
- CAMEL_IMAP4_LEVEL_UNKNOWN: 
- CAMEL_IMAP4_LEVEL_IMAP4: 
- CAMEL_IMAP4_LEVEL_IMAP4REV1: 
-
-<!-- ##### ENUM camel_imap4_resp_code_t ##### -->
-<para>
-
-</para>
-
- CAMEL_IMAP4_RESP_CODE_ALERT: 
- CAMEL_IMAP4_RESP_CODE_BADCHARSET: 
- CAMEL_IMAP4_RESP_CODE_CAPABILITY: 
- CAMEL_IMAP4_RESP_CODE_PARSE: 
- CAMEL_IMAP4_RESP_CODE_PERM_FLAGS: 
- CAMEL_IMAP4_RESP_CODE_READONLY: 
- CAMEL_IMAP4_RESP_CODE_READWRITE: 
- CAMEL_IMAP4_RESP_CODE_TRYCREATE: 
- CAMEL_IMAP4_RESP_CODE_UIDNEXT: 
- CAMEL_IMAP4_RESP_CODE_UIDVALIDITY: 
- CAMEL_IMAP4_RESP_CODE_UNSEEN: 
- CAMEL_IMAP4_RESP_CODE_NEWNAME: 
- CAMEL_IMAP4_RESP_CODE_APPENDUID: 
- CAMEL_IMAP4_RESP_CODE_COPYUID: 
- CAMEL_IMAP4_RESP_CODE_UNKNOWN: 
-
-<!-- ##### STRUCT CamelIMAP4RespCode ##### -->
-<para>
-
-</para>
-
- code: 
-
-<!-- ##### STRUCT CamelIMAP4Namespace ##### -->
-<para>
-
-</para>
-
- next: 
- path: 
- sep: 
-
-<!-- ##### STRUCT CamelIMAP4NamespaceList ##### -->
-<para>
-
-</para>
-
- personal: 
- other: 
- shared: 
-
-<!-- ##### USER_FUNCTION CamelIMAP4ReconnectFunc ##### -->
-<para>
-
-</para>
-
- engine: 
- ex: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_engine_new ##### -->
-<para>
-
-</para>
-
- service: 
- reconnect: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_engine_take_stream ##### -->
-<para>
-
-</para>
-
- engine: 
- stream: 
- ex: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_engine_disconnect ##### -->
-<para>
-
-</para>
-
- engine: 
-
-
-<!-- ##### FUNCTION camel_imap4_engine_capability ##### -->
-<para>
-
-</para>
-
- engine: 
- ex: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_engine_namespace ##### -->
-<para>
-
-</para>
-
- engine: 
- ex: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_engine_select_folder ##### -->
-<para>
-
-</para>
-
- engine: 
- folder: 
- ex: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_engine_queue ##### -->
-<para>
-
-</para>
-
- engine: 
- folder: 
- format: 
- Varargs: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_engine_prequeue ##### -->
-<para>
-
-</para>
-
- engine: 
- folder: 
- format: 
- Varargs: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_engine_dequeue ##### -->
-<para>
-
-</para>
-
- engine: 
- ic: 
-
-
-<!-- ##### FUNCTION camel_imap4_engine_iterate ##### -->
-<para>
-
-</para>
-
- engine: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_engine_handle_untagged_1 ##### -->
-<para>
-
-</para>
-
- engine: 
- token: 
- ex: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_engine_handle_untagged ##### -->
-<para>
-
-</para>
-
- engine: 
- ex: 
-
-
-<!-- ##### FUNCTION camel_imap4_engine_next_token ##### -->
-<para>
-
-</para>
-
- engine: 
- token: 
- ex: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_engine_line ##### -->
-<para>
-
-</para>
-
- engine: 
- line: 
- len: 
- ex: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_engine_literal ##### -->
-<para>
-
-</para>
-
- engine: 
- literal: 
- len: 
- ex: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_engine_nstring ##### -->
-<para>
-
-</para>
-
- engine: 
- nstring: 
- ex: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_engine_eat_line ##### -->
-<para>
-
-</para>
-
- engine: 
- ex: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_engine_parse_resp_code ##### -->
-<para>
-
-</para>
-
- engine: 
- ex: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_resp_code_free ##### -->
-<para>
-
-</para>
-
- rcode: 
-
-
diff --git a/docs/reference/camel/tmpl/camel-imap4-folder.sgml b/docs/reference/camel/tmpl/camel-imap4-folder.sgml
index 42448be..719a948 100644
--- a/docs/reference/camel/tmpl/camel-imap4-folder.sgml
+++ b/docs/reference/camel/tmpl/camel-imap4-folder.sgml
@@ -17,37 +17,3 @@ CamelIMAP4Folder
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### STRUCT CamelIMAP4Folder ##### -->
-<para>
-
-</para>
-
- parent: 
- search: 
- journal: 
- cache: 
- cachedir: 
- utf7_name: 
- read_only: 
- enable_mlist: 
-
-<!-- ##### FUNCTION camel_imap4_folder_new ##### -->
-<para>
-
-</para>
-
- store: 
- full_name: 
- ex: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_folder_utf7_name ##### -->
-<para>
-
-</para>
-
- folder: 
- Returns: 
-
-
diff --git a/docs/reference/camel/tmpl/camel-imap4-journal.sgml b/docs/reference/camel/tmpl/camel-imap4-journal.sgml
index 2095412..399bc04 100644
--- a/docs/reference/camel/tmpl/camel-imap4-journal.sgml
+++ b/docs/reference/camel/tmpl/camel-imap4-journal.sgml
@@ -17,49 +17,3 @@ CamelIMAP4Journal
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### STRUCT CamelIMAP4Journal ##### -->
-<para>
-
-</para>
-
- parent: 
- failed: 
-
-<!-- ##### STRUCT CamelIMAP4JournalEntry ##### -->
-<para>
-
-</para>
-
- node: 
- type: 
-
-<!-- ##### FUNCTION camel_imap4_journal_new ##### -->
-<para>
-
-</para>
-
- folder: 
- filename: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_journal_readd_failed ##### -->
-<para>
-
-</para>
-
- journal: 
-
-
-<!-- ##### FUNCTION camel_imap4_journal_append ##### -->
-<para>
-
-</para>
-
- journal: 
- message: 
- mi: 
- appended_uid: 
- ex: 
-
-
diff --git a/docs/reference/camel/tmpl/camel-imap4-search.sgml b/docs/reference/camel/tmpl/camel-imap4-search.sgml
index 678b010..43600f5 100644
--- a/docs/reference/camel/tmpl/camel-imap4-search.sgml
+++ b/docs/reference/camel/tmpl/camel-imap4-search.sgml
@@ -17,27 +17,3 @@ CamelIMAP4Search
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### STRUCT CamelIMAP4Search ##### -->
-<para>
-
-</para>
-
- parent: 
- engine: 
- lastuid: 
- validity: 
- cache: 
- matches: 
- matches_hash: 
- matches_count: 
-
-<!-- ##### FUNCTION camel_imap4_search_new ##### -->
-<para>
-
-</para>
-
- engine: 
- cachedir: 
- Returns: 
-
-
diff --git a/docs/reference/camel/tmpl/camel-imap4-specials.sgml b/docs/reference/camel/tmpl/camel-imap4-specials.sgml
index 69cb5fa..2f5837b 100644
--- a/docs/reference/camel/tmpl/camel-imap4-specials.sgml
+++ b/docs/reference/camel/tmpl/camel-imap4-specials.sgml
@@ -17,59 +17,3 @@ camel-imap4-specials
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### MACRO is_atom ##### -->
-<para>
-
-</para>
-
- x: 
-
-
-<!-- ##### MACRO is_ctrl ##### -->
-<para>
-
-</para>
-
- x: 
-
-
-<!-- ##### MACRO is_lwsp ##### -->
-<para>
-
-</para>
-
- x: 
-
-
-<!-- ##### MACRO is_type ##### -->
-<para>
-
-</para>
-
- x: 
- t: 
-
-
-<!-- ##### MACRO is_qsafe ##### -->
-<para>
-
-</para>
-
- x: 
-
-
-<!-- ##### MACRO is_wild ##### -->
-<para>
-
-</para>
-
- x: 
-
-
-<!-- ##### FUNCTION camel_imap4_specials_init ##### -->
-<para>
-
-</para>
-
-
-
diff --git a/docs/reference/camel/tmpl/camel-imap4-store-summary.sgml b/docs/reference/camel/tmpl/camel-imap4-store-summary.sgml
index 8264999..b890181 100644
--- a/docs/reference/camel/tmpl/camel-imap4-store-summary.sgml
+++ b/docs/reference/camel/tmpl/camel-imap4-store-summary.sgml
@@ -17,76 +17,3 @@ CamelIMAP4StoreSummary
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### STRUCT CamelIMAP4StoreInfo ##### -->
-<para>
-
-</para>
-
- info: 
-
-<!-- ##### STRUCT CamelIMAP4StoreSummary ##### -->
-<para>
-
-</para>
-
- summary: 
- priv: 
- version: 
- namespaces: 
- capa: 
-
-<!-- ##### FUNCTION camel_imap4_store_summary_new ##### -->
-<para>
-
-</para>
-
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_store_summary_set_capabilities ##### -->
-<para>
-
-</para>
-
- s: 
- capa: 
-
-
-<!-- ##### FUNCTION camel_imap4_store_summary_set_namespaces ##### -->
-<para>
-
-</para>
-
- s: 
- ns: 
-
-
-<!-- ##### FUNCTION camel_imap4_store_summary_note_info ##### -->
-<para>
-
-</para>
-
- s: 
- fi: 
-
-
-<!-- ##### FUNCTION camel_imap4_store_summary_unnote_info ##### -->
-<para>
-
-</para>
-
- s: 
- fi: 
-
-
-<!-- ##### FUNCTION camel_imap4_store_summary_get_folder_info ##### -->
-<para>
-
-</para>
-
- s: 
- top: 
- flags: 
- Returns: 
-
-
diff --git a/docs/reference/camel/tmpl/camel-imap4-store.sgml b/docs/reference/camel/tmpl/camel-imap4-store.sgml
index b2b6ea3..dc04e5e 100644
--- a/docs/reference/camel/tmpl/camel-imap4-store.sgml
+++ b/docs/reference/camel/tmpl/camel-imap4-store.sgml
@@ -17,13 +17,3 @@ CamelIMAP4Store
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### STRUCT CamelIMAP4Store ##### -->
-<para>
-
-</para>
-
- parent: 
- summary: 
- engine: 
- storage_path: 
-
diff --git a/docs/reference/camel/tmpl/camel-imap4-stream.sgml b/docs/reference/camel/tmpl/camel-imap4-stream.sgml
index 1c9627a..0cf556b 100644
--- a/docs/reference/camel/tmpl/camel-imap4-stream.sgml
+++ b/docs/reference/camel/tmpl/camel-imap4-stream.sgml
@@ -17,96 +17,3 @@ CamelIMAP4Stream
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### MACRO IMAP4_READ_PRELEN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO IMAP4_READ_BUFLEN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT camel_imap4_token_t ##### -->
-<para>
-
-</para>
-
- token: 
-
-<!-- ##### STRUCT CamelIMAP4Stream ##### -->
-<para>
-
-</para>
-
- parent: 
- stream: 
- disconnected: 
- have_unget: 
- mode: 
- eol: 
- literal: 
- realbuf: 
- inbuf: 
- inptr: 
- inend: 
- tokenbuf: 
- tokenptr: 
- tokenleft: 
- unget: 
-
-<!-- ##### FUNCTION camel_imap4_stream_new ##### -->
-<para>
-
-</para>
-
- stream: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_stream_next_token ##### -->
-<para>
-
-</para>
-
- stream: 
- token: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_stream_unget_token ##### -->
-<para>
-
-</para>
-
- stream: 
- token: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_stream_line ##### -->
-<para>
-
-</para>
-
- stream: 
- line: 
- len: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_stream_literal ##### -->
-<para>
-
-</para>
-
- stream: 
- literal: 
- len: 
- Returns: 
-
-
diff --git a/docs/reference/camel/tmpl/camel-imap4-summary.sgml b/docs/reference/camel/tmpl/camel-imap4-summary.sgml
index e2c78bc..7141e0f 100644
--- a/docs/reference/camel/tmpl/camel-imap4-summary.sgml
+++ b/docs/reference/camel/tmpl/camel-imap4-summary.sgml
@@ -17,112 +17,3 @@ CamelIMAP4Summary
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### STRUCT CamelIMAP4Summary ##### -->
-<para>
-
-</para>
-
- parent: 
- version: 
- exists: 
- recent: 
- unseen: 
- uidvalidity: 
- uidvalidity_changed: 
- update_flags: 
-
-<!-- ##### STRUCT CamelIMAP4MessageInfo ##### -->
-<para>
-
-</para>
-
- info: 
- server_flags: 
-
-<!-- ##### STRUCT CamelIMAP4MessageContentInfo ##### -->
-<para>
-
-</para>
-
- info: 
-
-<!-- ##### MACRO CAMEL_IMAP4_MESSAGE_RECENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION camel_imap4_summary_new ##### -->
-<para>
-
-</para>
-
- folder: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_summary_set_exists ##### -->
-<para>
-
-</para>
-
- summary: 
- exists: 
-
-
-<!-- ##### FUNCTION camel_imap4_summary_set_recent ##### -->
-<para>
-
-</para>
-
- summary: 
- recent: 
-
-
-<!-- ##### FUNCTION camel_imap4_summary_set_unseen ##### -->
-<para>
-
-</para>
-
- summary: 
- unseen: 
-
-
-<!-- ##### FUNCTION camel_imap4_summary_set_uidnext ##### -->
-<para>
-
-</para>
-
- summary: 
- uidnext: 
-
-
-<!-- ##### FUNCTION camel_imap4_summary_set_uidvalidity ##### -->
-<para>
-
-</para>
-
- summary: 
- uidvalidity: 
-
-
-<!-- ##### FUNCTION camel_imap4_summary_expunge ##### -->
-<para>
-
-</para>
-
- summary: 
- seqid: 
-
-
-<!-- ##### FUNCTION camel_imap4_summary_flush_updates ##### -->
-<para>
-
-</para>
-
- summary: 
- ex: 
- Returns: 
-
-
diff --git a/docs/reference/camel/tmpl/camel-imap4-utils.sgml b/docs/reference/camel/tmpl/camel-imap4-utils.sgml
index eb2ad9c..6eb5d85 100644
--- a/docs/reference/camel/tmpl/camel-imap4-utils.sgml
+++ b/docs/reference/camel/tmpl/camel-imap4-utils.sgml
@@ -25,188 +25,3 @@ camel-imap4-utils
 @changed: 
 @bits: 
 
-<!-- ##### FUNCTION camel_imap4_flags_diff ##### -->
-<para>
-
-</para>
-
- diff: 
- old: 
- new: 
-
-
-<!-- ##### FUNCTION camel_imap4_flags_merge ##### -->
-<para>
-
-</para>
-
- diff: 
- flags: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_merge_flags ##### -->
-<para>
-
-</para>
-
- original: 
- local: 
- server: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_build_folder_info_tree ##### -->
-<para>
-
-</para>
-
- array: 
- top: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_namespace_clear ##### -->
-<para>
-
-</para>
-
- ns: 
-
-
-<!-- ##### FUNCTION camel_imap4_namespace_list_copy ##### -->
-<para>
-
-</para>
-
- nsl: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_namespace_list_free ##### -->
-<para>
-
-</para>
-
- nsl: 
-
-
-<!-- ##### FUNCTION camel_imap4_get_path_delim ##### -->
-<para>
-
-</para>
-
- s: 
- full_name: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_get_uid_set ##### -->
-<para>
-
-</para>
-
- engine: 
- summary: 
- infos: 
- cur: 
- linelen: 
- set: 
- Returns: 
-
-
-<!-- ##### FUNCTION camel_imap4_utils_set_unexpected_token_error ##### -->
-<para>
-
-</para>
-
- ex: 
- engine: 
- token: 
-
-
-<!-- ##### FUNCTION camel_imap4_parse_flags_list ##### -->
-<para>
-
-</para>
-
- engine: 
- flags: 
- ex: 
- Returns: 
-
-
-<!-- ##### MACRO CAMEL_IMAP4_FOLDER_MARKED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_IMAP4_FOLDER_UNMARKED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT camel_imap4_list_t ##### -->
-<para>
-
-</para>
-
- flags: 
- delim: 
- name: 
-
-<!-- ##### FUNCTION camel_imap4_untagged_list ##### -->
-<para>
-
-</para>
-
- engine: 
- ic: 
- index: 
- token: 
- ex: 
- Returns: 
-
-
-<!-- ##### STRUCT camel_imap4_status_attr_t ##### -->
-<para>
-
-</para>
-
- next: 
- type: 
- value: 
-
-<!-- ##### STRUCT camel_imap4_status_t ##### -->
-<para>
-
-</para>
-
- attr_list: 
- mailbox: 
-
-<!-- ##### FUNCTION camel_imap4_status_free ##### -->
-<para>
-
-</para>
-
- status: 
-
-
-<!-- ##### FUNCTION camel_imap4_untagged_status ##### -->
-<para>
-
-</para>
-
- engine: 
- ic: 
- index: 
- token: 
- ex: 
- Returns: 
-
-
diff --git a/docs/reference/camel/tmpl/camel-index.sgml b/docs/reference/camel/tmpl/camel-index.sgml
index c2b3646..8585986 100644
--- a/docs/reference/camel/tmpl/camel-index.sgml
+++ b/docs/reference/camel/tmpl/camel-index.sgml
@@ -22,14 +22,6 @@ CamelIndex
 
 </para>
 
- parent: 
- priv: 
- path: 
- version: 
- flags: 
- state: 
- normalize: 
- normalize_data: 
 
 <!-- ##### USER_FUNCTION CamelIndexNorm ##### -->
 <para>
@@ -47,9 +39,6 @@ CamelIndex
 
 </para>
 
- parent: 
- priv: 
- index: 
 
 <!-- ##### FUNCTION camel_index_cursor_new ##### -->
 <para>
@@ -83,12 +72,6 @@ CamelIndex
 
 </para>
 
- parent: 
- priv: 
- index: 
- name: 
- buffer: 
- words: 
 
 <!-- ##### FUNCTION camel_index_name_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-internet-address.sgml b/docs/reference/camel/tmpl/camel-internet-address.sgml
index b1d03e4..a8fade6 100644
--- a/docs/reference/camel/tmpl/camel-internet-address.sgml
+++ b/docs/reference/camel/tmpl/camel-internet-address.sgml
@@ -22,8 +22,6 @@ CamelInternetAddress
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### FUNCTION camel_internet_address_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-medium.sgml b/docs/reference/camel/tmpl/camel-medium.sgml
index c6a1ad8..af15f39 100644
--- a/docs/reference/camel/tmpl/camel-medium.sgml
+++ b/docs/reference/camel/tmpl/camel-medium.sgml
@@ -22,8 +22,11 @@ CamelMedium
 
 </para>
 
- parent: 
- content: 
+
+<!-- ##### ARG CamelMedium:content ##### -->
+<para>
+
+</para>
 
 <!-- ##### STRUCT CamelMediumHeader ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-mime-filter-basic.sgml b/docs/reference/camel/tmpl/camel-mime-filter-basic.sgml
index 617d77f..22e855b 100644
--- a/docs/reference/camel/tmpl/camel-mime-filter-basic.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-filter-basic.sgml
@@ -22,8 +22,6 @@ CamelMimeFilterBasic
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### ENUM CamelMimeFilterBasicType ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-mime-filter-bestenc.sgml b/docs/reference/camel/tmpl/camel-mime-filter-bestenc.sgml
index a3a4974..505dfda 100644
--- a/docs/reference/camel/tmpl/camel-mime-filter-bestenc.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-filter-bestenc.sgml
@@ -42,8 +42,6 @@ CamelMimeFilterBestenc
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### FUNCTION camel_mime_filter_bestenc_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-mime-filter-canon.sgml b/docs/reference/camel/tmpl/camel-mime-filter-canon.sgml
index 23dff68..336eee0 100644
--- a/docs/reference/camel/tmpl/camel-mime-filter-canon.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-filter-canon.sgml
@@ -22,8 +22,6 @@ CamelMimeFilterCanon
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### FUNCTION camel_mime_filter_canon_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-mime-filter-charset.sgml b/docs/reference/camel/tmpl/camel-mime-filter-charset.sgml
index b7dd16e..9806a55 100644
--- a/docs/reference/camel/tmpl/camel-mime-filter-charset.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-filter-charset.sgml
@@ -22,8 +22,6 @@ CamelMimeFilterCharset
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### FUNCTION camel_mime_filter_charset_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-mime-filter-crlf.sgml b/docs/reference/camel/tmpl/camel-mime-filter-crlf.sgml
index d946a00..936b52c 100644
--- a/docs/reference/camel/tmpl/camel-mime-filter-crlf.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-filter-crlf.sgml
@@ -22,8 +22,6 @@ CamelMimeFilterCRLF
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### ENUM CamelMimeFilterCRLFDirection ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-mime-filter-enriched.sgml b/docs/reference/camel/tmpl/camel-mime-filter-enriched.sgml
index d26326b..a69b360 100644
--- a/docs/reference/camel/tmpl/camel-mime-filter-enriched.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-filter-enriched.sgml
@@ -22,8 +22,6 @@ CamelMimeFilterEnriched
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### MACRO CAMEL_MIME_FILTER_ENRICHED_IS_RICHTEXT ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-mime-filter-from.sgml b/docs/reference/camel/tmpl/camel-mime-filter-from.sgml
index 8502442..cb78e93 100644
--- a/docs/reference/camel/tmpl/camel-mime-filter-from.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-filter-from.sgml
@@ -22,8 +22,6 @@ CamelMimeFilterFrom
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### FUNCTION camel_mime_filter_from_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-mime-filter-gzip.sgml b/docs/reference/camel/tmpl/camel-mime-filter-gzip.sgml
index 98f6aac..b0f2fbf 100644
--- a/docs/reference/camel/tmpl/camel-mime-filter-gzip.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-filter-gzip.sgml
@@ -22,8 +22,6 @@ CamelMimeFilterGZip
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### ENUM CamelMimeFilterGZipMode ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-mime-filter-html.sgml b/docs/reference/camel/tmpl/camel-mime-filter-html.sgml
index f4ce6d9..3b13488 100644
--- a/docs/reference/camel/tmpl/camel-mime-filter-html.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-filter-html.sgml
@@ -22,8 +22,6 @@ CamelMimeFilterHTML
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### FUNCTION camel_mime_filter_html_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-mime-filter-index.sgml b/docs/reference/camel/tmpl/camel-mime-filter-index.sgml
index 85aa557..8e0d706 100644
--- a/docs/reference/camel/tmpl/camel-mime-filter-index.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-filter-index.sgml
@@ -22,8 +22,6 @@ CamelMimeFilterIndex
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### FUNCTION camel_mime_filter_index_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-mime-filter-linewrap.sgml b/docs/reference/camel/tmpl/camel-mime-filter-linewrap.sgml
index d38d24d..b59e3cc 100644
--- a/docs/reference/camel/tmpl/camel-mime-filter-linewrap.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-filter-linewrap.sgml
@@ -22,8 +22,6 @@ CamelMimeFilterLinewrap
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### FUNCTION camel_mime_filter_linewrap_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-mime-filter-pgp.sgml b/docs/reference/camel/tmpl/camel-mime-filter-pgp.sgml
index 32fa671..ecba711 100644
--- a/docs/reference/camel/tmpl/camel-mime-filter-pgp.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-filter-pgp.sgml
@@ -22,8 +22,6 @@ CamelMimeFilterPgp
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### FUNCTION camel_mime_filter_pgp_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-mime-filter-progress.sgml b/docs/reference/camel/tmpl/camel-mime-filter-progress.sgml
index 4fd0fc7..ba16e3f 100644
--- a/docs/reference/camel/tmpl/camel-mime-filter-progress.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-filter-progress.sgml
@@ -22,8 +22,6 @@ CamelMimeFilterProgress
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### FUNCTION camel_mime_filter_progress_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-mime-filter-save.sgml b/docs/reference/camel/tmpl/camel-mime-filter-save.sgml
index bd8e171..3ae7be0 100644
--- a/docs/reference/camel/tmpl/camel-mime-filter-save.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-filter-save.sgml
@@ -22,8 +22,6 @@ CamelMimeFilterSave
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### FUNCTION camel_mime_filter_save_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-mime-filter-tohtml.sgml b/docs/reference/camel/tmpl/camel-mime-filter-tohtml.sgml
index 7e34b92..045a916 100644
--- a/docs/reference/camel/tmpl/camel-mime-filter-tohtml.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-filter-tohtml.sgml
@@ -22,8 +22,6 @@ CamelMimeFilterToHTML
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### MACRO CAMEL_MIME_FILTER_TOHTML_PRE ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-mime-filter-windows.sgml b/docs/reference/camel/tmpl/camel-mime-filter-windows.sgml
index 273381e..a82467f 100644
--- a/docs/reference/camel/tmpl/camel-mime-filter-windows.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-filter-windows.sgml
@@ -22,8 +22,6 @@ CamelMimeFilterWindows
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### FUNCTION camel_mime_filter_windows_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-mime-filter-yenc.sgml b/docs/reference/camel/tmpl/camel-mime-filter-yenc.sgml
index 0b4590f..b532a44 100644
--- a/docs/reference/camel/tmpl/camel-mime-filter-yenc.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-filter-yenc.sgml
@@ -22,8 +22,6 @@ CamelMimeFilterYenc
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### ENUM CamelMimeFilterYencDirection ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-mime-filter.sgml b/docs/reference/camel/tmpl/camel-mime-filter.sgml
index 13572c9..f96d7d6 100644
--- a/docs/reference/camel/tmpl/camel-mime-filter.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-filter.sgml
@@ -22,16 +22,6 @@ CamelMimeFilter
 
 </para>
 
- parent: 
- priv: 
- outreal: 
- outbuf: 
- outptr: 
- outsize: 
- outpre: 
- backbuf: 
- backsize: 
- backlen: 
 
 <!-- ##### FUNCTION camel_mime_filter_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-mime-message.sgml b/docs/reference/camel/tmpl/camel-mime-message.sgml
index c8ed194..f7b6ed6 100644
--- a/docs/reference/camel/tmpl/camel-mime-message.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-message.sgml
@@ -22,16 +22,6 @@ CamelMimeMessage
 
 </para>
 
- parent: 
- date: 
- date_offset: 
- date_received: 
- date_received_offset: 
- subject: 
- message_id: 
- reply_to: 
- from: 
- recipients: 
 
 <!-- ##### MACRO CAMEL_RECIPIENT_TYPE_TO ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-mime-parser.sgml b/docs/reference/camel/tmpl/camel-mime-parser.sgml
index 18a207c..d31c7bf 100644
--- a/docs/reference/camel/tmpl/camel-mime-parser.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-parser.sgml
@@ -22,8 +22,6 @@ CamelMimeParser
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### ENUM camel_mime_parser_state_t ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-mime-part.sgml b/docs/reference/camel/tmpl/camel-mime-part.sgml
index 3fbaa9b..1629dbd 100644
--- a/docs/reference/camel/tmpl/camel-mime-part.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-part.sgml
@@ -22,15 +22,26 @@ CamelMimePart
 
 </para>
 
- parent: 
- headers: 
- description: 
- disposition: 
- content_id: 
- content_MD5: 
- content_location: 
- content_languages: 
- encoding: 
+
+<!-- ##### ARG CamelMimePart:content-id ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG CamelMimePart:content-md5 ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG CamelMimePart:description ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG CamelMimePart:disposition ##### -->
+<para>
+
+</para>
 
 <!-- ##### FUNCTION camel_mime_part_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-multipart-encrypted.sgml b/docs/reference/camel/tmpl/camel-multipart-encrypted.sgml
index edf031b..08650ed 100644
--- a/docs/reference/camel/tmpl/camel-multipart-encrypted.sgml
+++ b/docs/reference/camel/tmpl/camel-multipart-encrypted.sgml
@@ -22,11 +22,6 @@ CamelMultipartEncrypted
 
 </para>
 
- parent: 
- version: 
- content: 
- decrypted: 
- protocol: 
 
 <!-- ##### FUNCTION camel_multipart_encrypted_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-multipart-signed.sgml b/docs/reference/camel/tmpl/camel-multipart-signed.sgml
index 0c90906..5b52b15 100644
--- a/docs/reference/camel/tmpl/camel-multipart-signed.sgml
+++ b/docs/reference/camel/tmpl/camel-multipart-signed.sgml
@@ -22,16 +22,6 @@ CamelMultipartSigned
 
 </para>
 
- parent: 
- content: 
- signature: 
- contentraw: 
- protocol: 
- micalg: 
- start1: 
- end1: 
- start2: 
- end2: 
 
 <!-- ##### FUNCTION camel_multipart_signed_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-multipart.sgml b/docs/reference/camel/tmpl/camel-multipart.sgml
index 19994a4..dbda444 100644
--- a/docs/reference/camel/tmpl/camel-multipart.sgml
+++ b/docs/reference/camel/tmpl/camel-multipart.sgml
@@ -22,10 +22,6 @@ CamelMultipart
 
 </para>
 
- parent: 
- parts: 
- preface: 
- postface: 
 
 <!-- ##### FUNCTION camel_multipart_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-nntp-address.sgml b/docs/reference/camel/tmpl/camel-nntp-address.sgml
index 7d49d8a..21b710f 100644
--- a/docs/reference/camel/tmpl/camel-nntp-address.sgml
+++ b/docs/reference/camel/tmpl/camel-nntp-address.sgml
@@ -22,8 +22,6 @@ CamelNNTPAddress
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### FUNCTION camel_nntp_address_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-object.sgml b/docs/reference/camel/tmpl/camel-object.sgml
index 6178fb9..a7d933c 100644
--- a/docs/reference/camel/tmpl/camel-object.sgml
+++ b/docs/reference/camel/tmpl/camel-object.sgml
@@ -35,13 +35,6 @@ CamelObject
 
 </para>
 
- klass: 
- magic: 
- hooks: 
- ref_count: 
- flags: 
- next: 
- prev: 
 
 <!-- ##### MACRO CAMEL_CHECK_CAST ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-offline-folder.sgml b/docs/reference/camel/tmpl/camel-offline-folder.sgml
index 25c604a..250e5f2 100644
--- a/docs/reference/camel/tmpl/camel-offline-folder.sgml
+++ b/docs/reference/camel/tmpl/camel-offline-folder.sgml
@@ -22,8 +22,6 @@ CamelOfflineFolder
 
 </para>
 
- parent: 
- sync_offline: 
 
 <!-- ##### FUNCTION camel_offline_folder_downsync ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-offline-journal.sgml b/docs/reference/camel/tmpl/camel-offline-journal.sgml
index 6ab8510..9d732d7 100644
--- a/docs/reference/camel/tmpl/camel-offline-journal.sgml
+++ b/docs/reference/camel/tmpl/camel-offline-journal.sgml
@@ -22,10 +22,6 @@ CamelOfflineJournal
 
 </para>
 
- parent: 
- folder: 
- filename: 
- queue: 
 
 <!-- ##### STRUCT CamelOfflineJournalEntry ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-offline-store.sgml b/docs/reference/camel/tmpl/camel-offline-store.sgml
index 9e2c453..728e593 100644
--- a/docs/reference/camel/tmpl/camel-offline-store.sgml
+++ b/docs/reference/camel/tmpl/camel-offline-store.sgml
@@ -22,8 +22,6 @@ CamelOfflineStore
 
 </para>
 
- parent: 
- state: 
 
 <!-- ##### FUNCTION camel_offline_store_set_network_state ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-partition-table.sgml b/docs/reference/camel/tmpl/camel-partition-table.sgml
index b9eaafc..8f600d7 100644
--- a/docs/reference/camel/tmpl/camel-partition-table.sgml
+++ b/docs/reference/camel/tmpl/camel-partition-table.sgml
@@ -56,13 +56,6 @@ CamelKeyTable
 
 </para>
 
- parent: 
- priv: 
- blocks: 
- rootid: 
- is_key: 
- is_key_data: 
- partition: 
 
 <!-- ##### FUNCTION camel_partition_table_new ##### -->
 <para>
@@ -149,12 +142,6 @@ CamelKeyTable
 
 </para>
 
- parent: 
- priv: 
- blocks: 
- rootid: 
- root: 
- root_block: 
 
 <!-- ##### FUNCTION camel_key_table_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-sasl-anonymous.sgml b/docs/reference/camel/tmpl/camel-sasl-anonymous.sgml
index 6b4afb8..9653859 100644
--- a/docs/reference/camel/tmpl/camel-sasl-anonymous.sgml
+++ b/docs/reference/camel/tmpl/camel-sasl-anonymous.sgml
@@ -22,9 +22,6 @@ CamelSaslAnonymous
 
 </para>
 
- parent: 
- trace_info: 
- type: 
 
 <!-- ##### ENUM CamelSaslAnonTraceType ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-sasl-cram-md5.sgml b/docs/reference/camel/tmpl/camel-sasl-cram-md5.sgml
index cf30711..b4e39dc 100644
--- a/docs/reference/camel/tmpl/camel-sasl-cram-md5.sgml
+++ b/docs/reference/camel/tmpl/camel-sasl-cram-md5.sgml
@@ -22,8 +22,6 @@ CamelSaslCramMd5
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### VARIABLE camel_sasl_cram_md5_authtype ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-sasl-digest-md5.sgml b/docs/reference/camel/tmpl/camel-sasl-digest-md5.sgml
index d50d8e8..d1d54f7 100644
--- a/docs/reference/camel/tmpl/camel-sasl-digest-md5.sgml
+++ b/docs/reference/camel/tmpl/camel-sasl-digest-md5.sgml
@@ -22,8 +22,6 @@ CamelSaslDigestMd5
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### VARIABLE camel_sasl_digest_md5_authtype ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-sasl-gssapi.sgml b/docs/reference/camel/tmpl/camel-sasl-gssapi.sgml
index a8cf46f..bf2d7b4 100644
--- a/docs/reference/camel/tmpl/camel-sasl-gssapi.sgml
+++ b/docs/reference/camel/tmpl/camel-sasl-gssapi.sgml
@@ -22,8 +22,6 @@ CamelSaslGssapi
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### VARIABLE camel_sasl_gssapi_authtype ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-sasl-login.sgml b/docs/reference/camel/tmpl/camel-sasl-login.sgml
index d6cf93f..55f4dc8 100644
--- a/docs/reference/camel/tmpl/camel-sasl-login.sgml
+++ b/docs/reference/camel/tmpl/camel-sasl-login.sgml
@@ -22,8 +22,6 @@ CamelSaslLogin
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### VARIABLE camel_sasl_login_authtype ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-sasl-ntlm.sgml b/docs/reference/camel/tmpl/camel-sasl-ntlm.sgml
index 7077ad5..e475b80 100644
--- a/docs/reference/camel/tmpl/camel-sasl-ntlm.sgml
+++ b/docs/reference/camel/tmpl/camel-sasl-ntlm.sgml
@@ -22,8 +22,6 @@ CamelSaslNTLM
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### VARIABLE camel_sasl_ntlm_authtype ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-sasl-plain.sgml b/docs/reference/camel/tmpl/camel-sasl-plain.sgml
index 60a5422..3e1feb5 100644
--- a/docs/reference/camel/tmpl/camel-sasl-plain.sgml
+++ b/docs/reference/camel/tmpl/camel-sasl-plain.sgml
@@ -22,8 +22,6 @@ CamelSaslPlain
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### VARIABLE camel_sasl_plain_authtype ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-sasl-popb4smtp.sgml b/docs/reference/camel/tmpl/camel-sasl-popb4smtp.sgml
index 50ccd14..ac9ae62 100644
--- a/docs/reference/camel/tmpl/camel-sasl-popb4smtp.sgml
+++ b/docs/reference/camel/tmpl/camel-sasl-popb4smtp.sgml
@@ -22,8 +22,6 @@ CamelSaslPOPB4SMTP
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### VARIABLE camel_sasl_popb4smtp_authtype ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-sasl.sgml b/docs/reference/camel/tmpl/camel-sasl.sgml
index 4a3dea4..328761e 100644
--- a/docs/reference/camel/tmpl/camel-sasl.sgml
+++ b/docs/reference/camel/tmpl/camel-sasl.sgml
@@ -22,8 +22,26 @@ CamelSasl
 
 </para>
 
- parent: 
- priv: 
+
+<!-- ##### ARG CamelSasl:authenticated ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG CamelSasl:mechanism ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG CamelSasl:service ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG CamelSasl:service-name ##### -->
+<para>
+
+</para>
 
 <!-- ##### FUNCTION camel_sasl_challenge ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-seekable-stream.sgml b/docs/reference/camel/tmpl/camel-seekable-stream.sgml
index cc28a54..b12cddb 100644
--- a/docs/reference/camel/tmpl/camel-seekable-stream.sgml
+++ b/docs/reference/camel/tmpl/camel-seekable-stream.sgml
@@ -22,10 +22,6 @@ CamelSeekableStream
 
 </para>
 
- parent: 
- position: 
- bound_start: 
- bound_end: 
 
 <!-- ##### ENUM CamelStreamSeekPolicy ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-seekable-substream.sgml b/docs/reference/camel/tmpl/camel-seekable-substream.sgml
index 0609561..d2b9ef3 100644
--- a/docs/reference/camel/tmpl/camel-seekable-substream.sgml
+++ b/docs/reference/camel/tmpl/camel-seekable-substream.sgml
@@ -22,8 +22,6 @@ CamelSeekableSubstream
 
 </para>
 
- parent: 
- parent_stream: 
 
 <!-- ##### FUNCTION camel_seekable_substream_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-service.sgml b/docs/reference/camel/tmpl/camel-service.sgml
index 0474be8..b384dcb 100644
--- a/docs/reference/camel/tmpl/camel-service.sgml
+++ b/docs/reference/camel/tmpl/camel-service.sgml
@@ -22,13 +22,6 @@ CamelService
 
 </para>
 
- parent: 
- priv: 
- session: 
- provider: 
- status: 
- connect_op: 
- url: 
 
 <!-- ##### MACRO CAMEL_SERVICE_USERNAME ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-session.sgml b/docs/reference/camel/tmpl/camel-session.sgml
index 1c3b7f6..e868e6a 100644
--- a/docs/reference/camel/tmpl/camel-session.sgml
+++ b/docs/reference/camel/tmpl/camel-session.sgml
@@ -22,13 +22,6 @@ CamelSession
 
 </para>
 
- parent: 
- priv: 
- storage_path: 
- junk_plugin: 
- online: 
- check_junk: 
- network_state: 
 
 <!-- ##### USER_FUNCTION CamelTimeoutCallback ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-smime-context.sgml b/docs/reference/camel/tmpl/camel-smime-context.sgml
index 1a12ad3..78c3220 100644
--- a/docs/reference/camel/tmpl/camel-smime-context.sgml
+++ b/docs/reference/camel/tmpl/camel-smime-context.sgml
@@ -22,8 +22,6 @@ CamelSMIMEContext
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### ENUM camel_smime_sign_t ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-store-summary.sgml b/docs/reference/camel/tmpl/camel-store-summary.sgml
index e98a3d2..4886fa4 100644
--- a/docs/reference/camel/tmpl/camel-store-summary.sgml
+++ b/docs/reference/camel/tmpl/camel-store-summary.sgml
@@ -53,18 +53,6 @@ CamelStoreSummary
 
 </para>
 
- parent: 
- priv: 
- version: 
- flags: 
- count: 
- time: 
- uri_base: 
- store_info_size: 
- store_info_chunks: 
- summary_path: 
- folders: 
- folders_path: 
 
 <!-- ##### MACRO CAMEL_STORE_INFO_FOLDER_UNKNOWN ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-store.sgml b/docs/reference/camel/tmpl/camel-store.sgml
index 83c99a3..4960002 100644
--- a/docs/reference/camel/tmpl/camel-store.sgml
+++ b/docs/reference/camel/tmpl/camel-store.sgml
@@ -22,14 +22,6 @@ CamelStore
 
 </para>
 
- parent: 
- priv: 
- folders: 
- cdb_r: 
- cdb_w: 
- flags: 
- mode: 
- later: 
 
 <!-- ##### STRUCT CamelFolderInfo ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-stream-buffer.sgml b/docs/reference/camel/tmpl/camel-stream-buffer.sgml
index 9782e2e..35348b7 100644
--- a/docs/reference/camel/tmpl/camel-stream-buffer.sgml
+++ b/docs/reference/camel/tmpl/camel-stream-buffer.sgml
@@ -22,16 +22,6 @@ CamelStreamBuffer
 
 </para>
 
- parent: 
- stream: 
- buf: 
- ptr: 
- end: 
- size: 
- linebuf: 
- linesize: 
- mode: 
- flags: 
 
 <!-- ##### ENUM CamelStreamBufferMode ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-stream-filter.sgml b/docs/reference/camel/tmpl/camel-stream-filter.sgml
index 790b1b4..0311635 100644
--- a/docs/reference/camel/tmpl/camel-stream-filter.sgml
+++ b/docs/reference/camel/tmpl/camel-stream-filter.sgml
@@ -22,9 +22,6 @@ CamelStreamFilter
 
 </para>
 
- parent: 
- source: 
- priv: 
 
 <!-- ##### FUNCTION camel_stream_filter_add ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-stream-fs.sgml b/docs/reference/camel/tmpl/camel-stream-fs.sgml
index 4abf2ca..cbbf35d 100644
--- a/docs/reference/camel/tmpl/camel-stream-fs.sgml
+++ b/docs/reference/camel/tmpl/camel-stream-fs.sgml
@@ -22,8 +22,6 @@ CamelStreamFs
 
 </para>
 
- parent: 
- fd: 
 
 <!-- ##### FUNCTION camel_stream_fs_new_with_name ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-stream-mem.sgml b/docs/reference/camel/tmpl/camel-stream-mem.sgml
index d7a63a1..42a46c2 100644
--- a/docs/reference/camel/tmpl/camel-stream-mem.sgml
+++ b/docs/reference/camel/tmpl/camel-stream-mem.sgml
@@ -22,10 +22,6 @@ CamelStreamMem
 
 </para>
 
- parent: 
- owner: 
- secure: 
- buffer: 
 
 <!-- ##### FUNCTION camel_stream_mem_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-stream-null.sgml b/docs/reference/camel/tmpl/camel-stream-null.sgml
index 2c5a847..43c9a29 100644
--- a/docs/reference/camel/tmpl/camel-stream-null.sgml
+++ b/docs/reference/camel/tmpl/camel-stream-null.sgml
@@ -22,8 +22,6 @@ CamelStreamNull
 
 </para>
 
- parent: 
- written: 
 
 <!-- ##### FUNCTION camel_stream_null_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-stream-process.sgml b/docs/reference/camel/tmpl/camel-stream-process.sgml
index 351c1d2..a1e349e 100644
--- a/docs/reference/camel/tmpl/camel-stream-process.sgml
+++ b/docs/reference/camel/tmpl/camel-stream-process.sgml
@@ -22,9 +22,6 @@ CamelStreamProcess
 
 </para>
 
- parent: 
- sockfd: 
- childpid: 
 
 <!-- ##### FUNCTION camel_stream_process_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-stream-vfs.sgml b/docs/reference/camel/tmpl/camel-stream-vfs.sgml
index 2af3894..f984d8a 100644
--- a/docs/reference/camel/tmpl/camel-stream-vfs.sgml
+++ b/docs/reference/camel/tmpl/camel-stream-vfs.sgml
@@ -22,8 +22,6 @@ CamelStreamVFS
 
 </para>
 
- parent: 
- stream: 
 
 <!-- ##### ENUM CamelStreamVFSOpenMethod ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-stream.sgml b/docs/reference/camel/tmpl/camel-stream.sgml
index bbcd73a..109f381 100644
--- a/docs/reference/camel/tmpl/camel-stream.sgml
+++ b/docs/reference/camel/tmpl/camel-stream.sgml
@@ -22,8 +22,6 @@ CamelStream
 
 </para>
 
- parent: 
- eos: 
 
 <!-- ##### FUNCTION camel_stream_read ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-tcp-stream-raw.sgml b/docs/reference/camel/tmpl/camel-tcp-stream-raw.sgml
index cf53240..e78b311 100644
--- a/docs/reference/camel/tmpl/camel-tcp-stream-raw.sgml
+++ b/docs/reference/camel/tmpl/camel-tcp-stream-raw.sgml
@@ -22,9 +22,6 @@ CamelTcpStreamRaw
 
 </para>
 
- parent: 
- sockfd: 
- is_nonblocking: 
 
 <!-- ##### FUNCTION camel_tcp_stream_raw_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-tcp-stream-ssl.sgml b/docs/reference/camel/tmpl/camel-tcp-stream-ssl.sgml
index 15e5ceb..cfa1532 100644
--- a/docs/reference/camel/tmpl/camel-tcp-stream-ssl.sgml
+++ b/docs/reference/camel/tmpl/camel-tcp-stream-ssl.sgml
@@ -22,8 +22,6 @@ CamelTcpStreamSSL
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### MACRO CAMEL_TCP_STREAM_SSL_ENABLE_SSL2 ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-tcp-stream.sgml b/docs/reference/camel/tmpl/camel-tcp-stream.sgml
index 5e1cfa0..4ddafee 100644
--- a/docs/reference/camel/tmpl/camel-tcp-stream.sgml
+++ b/docs/reference/camel/tmpl/camel-tcp-stream.sgml
@@ -22,7 +22,6 @@ CamelTcpStream
 
 </para>
 
- parent: 
 
 <!-- ##### ENUM CamelSockOpt ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-text-index.sgml b/docs/reference/camel/tmpl/camel-text-index.sgml
index faa0037..ab4bb90 100644
--- a/docs/reference/camel/tmpl/camel-text-index.sgml
+++ b/docs/reference/camel/tmpl/camel-text-index.sgml
@@ -32,32 +32,24 @@ CamelTextIndex
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### STRUCT CamelTextIndexCursor ##### -->
 <para>
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### STRUCT CamelTextIndexKeyCursor ##### -->
 <para>
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### STRUCT CamelTextIndexName ##### -->
 <para>
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### FUNCTION camel_text_index_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-transport.sgml b/docs/reference/camel/tmpl/camel-transport.sgml
index e589313..4f43ce0 100644
--- a/docs/reference/camel/tmpl/camel-transport.sgml
+++ b/docs/reference/camel/tmpl/camel-transport.sgml
@@ -22,8 +22,6 @@ CamelTransport
 
 </para>
 
- parent: 
- priv: 
 
 <!-- ##### FUNCTION camel_transport_send_to ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-unused.sgml b/docs/reference/camel/tmpl/camel-unused.sgml
index fadc3bd..f648471 100644
--- a/docs/reference/camel/tmpl/camel-unused.sgml
+++ b/docs/reference/camel/tmpl/camel-unused.sgml
@@ -366,6 +366,24 @@ camel-types
 @f: 
 @l: 
 
+<!-- ##### MACRO CAMEL_IMAP4_FOLDER_MARKED ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_IMAP4_FOLDER_UNMARKED ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_IMAP4_MESSAGE_RECENT ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### MACRO CAMEL_IMAP_FOLDER_LOCK ##### -->
 <para>
 
@@ -496,6 +514,260 @@ camel-types
 
 @parent_object: 
 
+<!-- ##### STRUCT CamelIMAP4Command ##### -->
+<para>
+
+</para>
+
+ node: 
+ engine: 
+ ref_count: 
+ status: 
+ result: 
+ id: 
+ tag: 
+ resp_codes: 
+ folder: 
+ ex: 
+ parts: 
+ part: 
+ untagged: 
+ plus: 
+ reset: 
+ user_data: 
+
+<!-- ##### STRUCT CamelIMAP4CommandPart ##### -->
+<para>
+
+</para>
+
+ next: 
+ buffer: 
+ buflen: 
+ literal: 
+
+<!-- ##### USER_FUNCTION CamelIMAP4CommandReset ##### -->
+<para>
+
+</para>
+
+ ic: 
+ user_data: 
+
+<!-- ##### STRUCT CamelIMAP4Engine ##### -->
+<para>
+
+</para>
+
+ parent: 
+ reconnect: 
+ reconnecting: 
+ session: 
+ service: 
+ url: 
+ state: 
+ level: 
+ capa: 
+ maxlen: 
+ maxlentype: 
+ namespaces: 
+ authtypes: 
+ istream: 
+ ostream: 
+ tagprefix: 
+ tag: 
+ nextid: 
+ folder: 
+ queue: 
+ current: 
+
+<!-- ##### STRUCT CamelIMAP4Folder ##### -->
+<para>
+
+</para>
+
+ parent: 
+ search: 
+ journal: 
+ cache: 
+ cachedir: 
+ utf7_name: 
+ read_only: 
+ enable_mlist: 
+
+<!-- ##### STRUCT CamelIMAP4Journal ##### -->
+<para>
+
+</para>
+
+ parent: 
+ failed: 
+
+<!-- ##### STRUCT CamelIMAP4JournalEntry ##### -->
+<para>
+
+</para>
+
+ node: 
+ type: 
+
+<!-- ##### STRUCT CamelIMAP4Literal ##### -->
+<para>
+
+</para>
+
+ type: 
+
+<!-- ##### STRUCT CamelIMAP4MessageContentInfo ##### -->
+<para>
+
+</para>
+
+ info: 
+
+<!-- ##### STRUCT CamelIMAP4MessageInfo ##### -->
+<para>
+
+</para>
+
+ info: 
+ server_flags: 
+
+<!-- ##### STRUCT CamelIMAP4Namespace ##### -->
+<para>
+
+</para>
+
+ next: 
+ path: 
+ sep: 
+
+<!-- ##### STRUCT CamelIMAP4NamespaceList ##### -->
+<para>
+
+</para>
+
+ personal: 
+ other: 
+ shared: 
+
+<!-- ##### USER_FUNCTION CamelIMAP4PlusCallback ##### -->
+<para>
+
+</para>
+
+ engine: 
+ ic: 
+ linebuf: 
+ linelen: 
+ ex: 
+ Returns: 
+
+<!-- ##### USER_FUNCTION CamelIMAP4ReconnectFunc ##### -->
+<para>
+
+</para>
+
+ engine: 
+ ex: 
+ Returns: 
+
+<!-- ##### STRUCT CamelIMAP4RespCode ##### -->
+<para>
+
+</para>
+
+ code: 
+
+<!-- ##### STRUCT CamelIMAP4Search ##### -->
+<para>
+
+</para>
+
+ parent: 
+ engine: 
+ lastuid: 
+ validity: 
+ cache: 
+ matches: 
+ matches_hash: 
+ matches_count: 
+
+<!-- ##### STRUCT CamelIMAP4Store ##### -->
+<para>
+
+</para>
+
+ parent: 
+ summary: 
+ engine: 
+ storage_path: 
+
+<!-- ##### STRUCT CamelIMAP4StoreInfo ##### -->
+<para>
+
+</para>
+
+ info: 
+
+<!-- ##### STRUCT CamelIMAP4StoreSummary ##### -->
+<para>
+
+</para>
+
+ summary: 
+ priv: 
+ version: 
+ namespaces: 
+ capa: 
+
+<!-- ##### STRUCT CamelIMAP4Stream ##### -->
+<para>
+
+</para>
+
+ parent: 
+ stream: 
+ disconnected: 
+ have_unget: 
+ mode: 
+ eol: 
+ literal: 
+ realbuf: 
+ inbuf: 
+ inptr: 
+ inend: 
+ tokenbuf: 
+ tokenptr: 
+ tokenleft: 
+ unget: 
+
+<!-- ##### STRUCT CamelIMAP4Summary ##### -->
+<para>
+
+</para>
+
+ parent: 
+ version: 
+ exists: 
+ recent: 
+ unseen: 
+ uidvalidity: 
+ uidvalidity_changed: 
+ update_flags: 
+
+<!-- ##### USER_FUNCTION CamelIMAP4UntaggedCallback ##### -->
+<para>
+
+</para>
+
+ engine: 
+ ic: 
+ index: 
+ token: 
+ ex: 
+ Returns: 
+
 <!-- ##### STRUCT CamelISubscribe ##### -->
 <para>
 
@@ -638,6 +910,18 @@ camel-types
 </para>
 
 
+<!-- ##### MACRO IMAP4_READ_BUFLEN ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO IMAP4_READ_PRELEN ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### MACRO NI_MAXHOST ##### -->
 <para>
 
@@ -835,6 +1119,668 @@ camel-types
 @summary: 
 @array: 
 
+<!-- ##### FUNCTION camel_imap4_build_folder_info_tree ##### -->
+<para>
+
+</para>
+
+ array: 
+ top: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_command_new ##### -->
+<para>
+
+</para>
+
+ engine: 
+ folder: 
+ format: 
+ Varargs: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_command_newv ##### -->
+<para>
+
+</para>
+
+ engine: 
+ folder: 
+ format: 
+ args: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_command_ref ##### -->
+<para>
+
+</para>
+
+ ic: 
+
+<!-- ##### FUNCTION camel_imap4_command_register_untagged ##### -->
+<para>
+
+</para>
+
+ ic: 
+ atom: 
+ untagged: 
+
+<!-- ##### FUNCTION camel_imap4_command_reset ##### -->
+<para>
+
+</para>
+
+ ic: 
+
+<!-- ##### FUNCTION camel_imap4_command_step ##### -->
+<para>
+
+</para>
+
+ ic: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_command_unref ##### -->
+<para>
+
+</para>
+
+ ic: 
+
+<!-- ##### FUNCTION camel_imap4_engine_capability ##### -->
+<para>
+
+</para>
+
+ engine: 
+ ex: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_engine_dequeue ##### -->
+<para>
+
+</para>
+
+ engine: 
+ ic: 
+
+<!-- ##### FUNCTION camel_imap4_engine_disconnect ##### -->
+<para>
+
+</para>
+
+ engine: 
+
+<!-- ##### FUNCTION camel_imap4_engine_eat_line ##### -->
+<para>
+
+</para>
+
+ engine: 
+ ex: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_engine_handle_untagged ##### -->
+<para>
+
+</para>
+
+ engine: 
+ ex: 
+
+<!-- ##### FUNCTION camel_imap4_engine_handle_untagged_1 ##### -->
+<para>
+
+</para>
+
+ engine: 
+ token: 
+ ex: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_engine_iterate ##### -->
+<para>
+
+</para>
+
+ engine: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_engine_line ##### -->
+<para>
+
+</para>
+
+ engine: 
+ line: 
+ len: 
+ ex: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_engine_literal ##### -->
+<para>
+
+</para>
+
+ engine: 
+ literal: 
+ len: 
+ ex: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_engine_namespace ##### -->
+<para>
+
+</para>
+
+ engine: 
+ ex: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_engine_new ##### -->
+<para>
+
+</para>
+
+ service: 
+ reconnect: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_engine_next_token ##### -->
+<para>
+
+</para>
+
+ engine: 
+ token: 
+ ex: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_engine_nstring ##### -->
+<para>
+
+</para>
+
+ engine: 
+ nstring: 
+ ex: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_engine_parse_resp_code ##### -->
+<para>
+
+</para>
+
+ engine: 
+ ex: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_engine_prequeue ##### -->
+<para>
+
+</para>
+
+ engine: 
+ folder: 
+ format: 
+ Varargs: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_engine_queue ##### -->
+<para>
+
+</para>
+
+ engine: 
+ folder: 
+ format: 
+ Varargs: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_engine_select_folder ##### -->
+<para>
+
+</para>
+
+ engine: 
+ folder: 
+ ex: 
+ Returns: 
+
+<!-- ##### ENUM camel_imap4_engine_t ##### -->
+<para>
+
+</para>
+
+ CAMEL_IMAP4_ENGINE_DISCONNECTED: 
+ CAMEL_IMAP4_ENGINE_CONNECTED: 
+ CAMEL_IMAP4_ENGINE_PREAUTH: 
+ CAMEL_IMAP4_ENGINE_AUTHENTICATED: 
+ CAMEL_IMAP4_ENGINE_SELECTED: 
+
+<!-- ##### FUNCTION camel_imap4_engine_take_stream ##### -->
+<para>
+
+</para>
+
+ engine: 
+ stream: 
+ ex: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_flags_diff ##### -->
+<para>
+
+</para>
+
+ diff: 
+ old: 
+ new: 
+
+<!-- ##### FUNCTION camel_imap4_flags_merge ##### -->
+<para>
+
+</para>
+
+ diff: 
+ flags: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_folder_new ##### -->
+<para>
+
+</para>
+
+ store: 
+ full_name: 
+ ex: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_folder_utf7_name ##### -->
+<para>
+
+</para>
+
+ folder: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_get_path_delim ##### -->
+<para>
+
+</para>
+
+ s: 
+ full_name: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_get_uid_set ##### -->
+<para>
+
+</para>
+
+ engine: 
+ summary: 
+ infos: 
+ cur: 
+ linelen: 
+ set: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_journal_append ##### -->
+<para>
+
+</para>
+
+ journal: 
+ message: 
+ mi: 
+ appended_uid: 
+ ex: 
+
+<!-- ##### FUNCTION camel_imap4_journal_new ##### -->
+<para>
+
+</para>
+
+ folder: 
+ filename: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_journal_readd_failed ##### -->
+<para>
+
+</para>
+
+ journal: 
+
+<!-- ##### ENUM camel_imap4_level_t ##### -->
+<para>
+
+</para>
+
+ CAMEL_IMAP4_LEVEL_UNKNOWN: 
+ CAMEL_IMAP4_LEVEL_IMAP4: 
+ CAMEL_IMAP4_LEVEL_IMAP4REV1: 
+
+<!-- ##### STRUCT camel_imap4_list_t ##### -->
+<para>
+
+</para>
+
+ flags: 
+ delim: 
+ name: 
+
+<!-- ##### FUNCTION camel_imap4_merge_flags ##### -->
+<para>
+
+</para>
+
+ original: 
+ local: 
+ server: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_namespace_clear ##### -->
+<para>
+
+</para>
+
+ ns: 
+
+<!-- ##### FUNCTION camel_imap4_namespace_list_copy ##### -->
+<para>
+
+</para>
+
+ nsl: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_namespace_list_free ##### -->
+<para>
+
+</para>
+
+ nsl: 
+
+<!-- ##### FUNCTION camel_imap4_parse_flags_list ##### -->
+<para>
+
+</para>
+
+ engine: 
+ flags: 
+ ex: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_resp_code_free ##### -->
+<para>
+
+</para>
+
+ rcode: 
+
+<!-- ##### ENUM camel_imap4_resp_code_t ##### -->
+<para>
+
+</para>
+
+ CAMEL_IMAP4_RESP_CODE_ALERT: 
+ CAMEL_IMAP4_RESP_CODE_BADCHARSET: 
+ CAMEL_IMAP4_RESP_CODE_CAPABILITY: 
+ CAMEL_IMAP4_RESP_CODE_PARSE: 
+ CAMEL_IMAP4_RESP_CODE_PERM_FLAGS: 
+ CAMEL_IMAP4_RESP_CODE_READONLY: 
+ CAMEL_IMAP4_RESP_CODE_READWRITE: 
+ CAMEL_IMAP4_RESP_CODE_TRYCREATE: 
+ CAMEL_IMAP4_RESP_CODE_UIDNEXT: 
+ CAMEL_IMAP4_RESP_CODE_UIDVALIDITY: 
+ CAMEL_IMAP4_RESP_CODE_UNSEEN: 
+ CAMEL_IMAP4_RESP_CODE_NEWNAME: 
+ CAMEL_IMAP4_RESP_CODE_APPENDUID: 
+ CAMEL_IMAP4_RESP_CODE_COPYUID: 
+ CAMEL_IMAP4_RESP_CODE_UNKNOWN: 
+
+<!-- ##### FUNCTION camel_imap4_search_new ##### -->
+<para>
+
+</para>
+
+ engine: 
+ cachedir: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_specials_init ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT camel_imap4_status_attr_t ##### -->
+<para>
+
+</para>
+
+ next: 
+ type: 
+ value: 
+
+<!-- ##### FUNCTION camel_imap4_status_free ##### -->
+<para>
+
+</para>
+
+ status: 
+
+<!-- ##### STRUCT camel_imap4_status_t ##### -->
+<para>
+
+</para>
+
+ attr_list: 
+ mailbox: 
+
+<!-- ##### FUNCTION camel_imap4_store_summary_get_folder_info ##### -->
+<para>
+
+</para>
+
+ s: 
+ top: 
+ flags: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_store_summary_new ##### -->
+<para>
+
+</para>
+
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_store_summary_note_info ##### -->
+<para>
+
+</para>
+
+ s: 
+ fi: 
+
+<!-- ##### FUNCTION camel_imap4_store_summary_set_capabilities ##### -->
+<para>
+
+</para>
+
+ s: 
+ capa: 
+
+<!-- ##### FUNCTION camel_imap4_store_summary_set_namespaces ##### -->
+<para>
+
+</para>
+
+ s: 
+ ns: 
+
+<!-- ##### FUNCTION camel_imap4_store_summary_unnote_info ##### -->
+<para>
+
+</para>
+
+ s: 
+ fi: 
+
+<!-- ##### FUNCTION camel_imap4_stream_line ##### -->
+<para>
+
+</para>
+
+ stream: 
+ line: 
+ len: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_stream_literal ##### -->
+<para>
+
+</para>
+
+ stream: 
+ literal: 
+ len: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_stream_new ##### -->
+<para>
+
+</para>
+
+ stream: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_stream_next_token ##### -->
+<para>
+
+</para>
+
+ stream: 
+ token: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_stream_unget_token ##### -->
+<para>
+
+</para>
+
+ stream: 
+ token: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_summary_expunge ##### -->
+<para>
+
+</para>
+
+ summary: 
+ seqid: 
+
+<!-- ##### FUNCTION camel_imap4_summary_flush_updates ##### -->
+<para>
+
+</para>
+
+ summary: 
+ ex: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_summary_new ##### -->
+<para>
+
+</para>
+
+ folder: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_summary_set_exists ##### -->
+<para>
+
+</para>
+
+ summary: 
+ exists: 
+
+<!-- ##### FUNCTION camel_imap4_summary_set_recent ##### -->
+<para>
+
+</para>
+
+ summary: 
+ recent: 
+
+<!-- ##### FUNCTION camel_imap4_summary_set_uidnext ##### -->
+<para>
+
+</para>
+
+ summary: 
+ uidnext: 
+
+<!-- ##### FUNCTION camel_imap4_summary_set_uidvalidity ##### -->
+<para>
+
+</para>
+
+ summary: 
+ uidvalidity: 
+
+<!-- ##### FUNCTION camel_imap4_summary_set_unseen ##### -->
+<para>
+
+</para>
+
+ summary: 
+ unseen: 
+
+<!-- ##### STRUCT camel_imap4_token_t ##### -->
+<para>
+
+</para>
+
+ token: 
+
+<!-- ##### FUNCTION camel_imap4_untagged_list ##### -->
+<para>
+
+</para>
+
+ engine: 
+ ic: 
+ index: 
+ token: 
+ ex: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_untagged_status ##### -->
+<para>
+
+</para>
+
+ engine: 
+ ic: 
+ index: 
+ token: 
+ ex: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_imap4_utils_set_unexpected_token_error ##### -->
+<para>
+
+</para>
+
+ ex: 
+ engine: 
+ token: 
+
 <!-- ##### FUNCTION camel_imap_store_summary_namespace_new ##### -->
 <para>
 
@@ -1407,3 +2353,46 @@ camel-types
 @folder_name: 
 @Returns: 
 
+<!-- ##### MACRO is_atom ##### -->
+<para>
+
+</para>
+
+ x: 
+
+<!-- ##### MACRO is_ctrl ##### -->
+<para>
+
+</para>
+
+ x: 
+
+<!-- ##### MACRO is_lwsp ##### -->
+<para>
+
+</para>
+
+ x: 
+
+<!-- ##### MACRO is_qsafe ##### -->
+<para>
+
+</para>
+
+ x: 
+
+<!-- ##### MACRO is_type ##### -->
+<para>
+
+</para>
+
+ x: 
+ t: 
+
+<!-- ##### MACRO is_wild ##### -->
+<para>
+
+</para>
+
+ x: 
+
diff --git a/docs/reference/camel/tmpl/camel-vee-folder.sgml b/docs/reference/camel/tmpl/camel-vee-folder.sgml
index 8675cb2..2d24836 100644
--- a/docs/reference/camel/tmpl/camel-vee-folder.sgml
+++ b/docs/reference/camel/tmpl/camel-vee-folder.sgml
@@ -22,16 +22,6 @@ CamelVeeFolder
 
 </para>
 
- parent: 
- priv: 
- expression: 
- flags: 
- changes: 
- search: 
- parent_vee_store: 
- hashes: 
- loaded: 
- deleted: 
 
 <!-- ##### MACRO CAMEL_UNMATCHED_NAME ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-vee-store.sgml b/docs/reference/camel/tmpl/camel-vee-store.sgml
index 723b730..61ae391 100644
--- a/docs/reference/camel/tmpl/camel-vee-store.sgml
+++ b/docs/reference/camel/tmpl/camel-vee-store.sgml
@@ -22,9 +22,6 @@ CamelVeeStore
 
 </para>
 
- parent: 
- folder_unmatched: 
- unmatched_uids: 
 
 <!-- ##### MACRO CAMEL_STORE_VEE_FOLDER_AUTO ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-vee-summary.sgml b/docs/reference/camel/tmpl/camel-vee-summary.sgml
index 969d25f..137b636 100644
--- a/docs/reference/camel/tmpl/camel-vee-summary.sgml
+++ b/docs/reference/camel/tmpl/camel-vee-summary.sgml
@@ -22,9 +22,6 @@ CamelVeeSummary
 
 </para>
 
- summary: 
- force_counts: 
- fake_visible_count: 
 
 <!-- ##### STRUCT CamelVeeMessageInfo ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-vtrash-folder.sgml b/docs/reference/camel/tmpl/camel-vtrash-folder.sgml
index b08bedd..d9783c6 100644
--- a/docs/reference/camel/tmpl/camel-vtrash-folder.sgml
+++ b/docs/reference/camel/tmpl/camel-vtrash-folder.sgml
@@ -36,9 +36,6 @@ CamelVTrashFolder
 
 </para>
 
- parent: 
- type: 
- bit: 
 
 <!-- ##### ENUM camel_vtrash_folder_t ##### -->
 <para>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 19e8f0d..360c5aa 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -142,7 +142,6 @@ camel/providers/groupwise/camel-groupwise-store.c
 camel/providers/groupwise/camel-groupwise-summary.c
 camel/providers/groupwise/camel-groupwise-transport.c
 camel/providers/groupwise/camel-groupwise-utils.c
-camel/providers/hula/camel-hula-provider.c
 camel/providers/imap/camel-imap-command.c
 camel/providers/imap/camel-imap-folder.c
 camel/providers/imap/camel-imap-journal.c
@@ -154,18 +153,6 @@ camel/providers/imap/camel-imap-store.c
 camel/providers/imap/camel-imap-summary.c
 camel/providers/imap/camel-imap-utils.c
 camel/providers/imap/camel-imap-wrapper.c
-camel/providers/imap4/camel-imap4-command.c
-camel/providers/imap4/camel-imap4-engine.c
-camel/providers/imap4/camel-imap4-folder.c
-camel/providers/imap4/camel-imap4-journal.c
-camel/providers/imap4/camel-imap4-provider.c
-camel/providers/imap4/camel-imap4-search.c
-camel/providers/imap4/camel-imap4-specials.c
-camel/providers/imap4/camel-imap4-store-summary.c
-camel/providers/imap4/camel-imap4-store.c
-camel/providers/imap4/camel-imap4-stream.c
-camel/providers/imap4/camel-imap4-summary.c
-camel/providers/imap4/camel-imap4-utils.c
 camel/providers/imapx/camel-imapx-folder.c
 camel/providers/imapx/camel-imapx-provider.c
 camel/providers/imapx/camel-imapx-server.c



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]