From 00db76a4c51a866ed42c80acb8d2eac4d4c853dd Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <dirk-jan.binnema@nokia.com>
Date: Tue, 27 Feb 2007 12:18:31 +0000
Subject: [PATCH] * fix the doc building

pmo-trunk-r856
---
 docs/reference/modest-docs.sgml                    |   16 +-
 docs/reference/tmpl/modest-account-assistant.sgml  |    1 +
 docs/reference/tmpl/modest-account-mgr.sgml        |   36 +--
 .../reference/tmpl/modest-account-view-window.sgml |    1 +
 docs/reference/tmpl/modest-account-view.sgml       |    1 +
 docs/reference/tmpl/modest-combo-box.sgml          |    4 +-
 docs/reference/tmpl/modest-conf.sgml               |   11 +-
 docs/reference/tmpl/modest-defs.sgml               |    7 -
 docs/reference/tmpl/modest-folder-view.sgml        |   21 +-
 docs/reference/tmpl/modest-formatter.sgml          |    1 +
 docs/reference/tmpl/modest-header-view.sgml        |    2 +-
 .../tmpl/modest-mail-operation-queue.sgml          |    1 +
 docs/reference/tmpl/modest-mail-operation.sgml     |   50 +----
 docs/reference/tmpl/modest-main-window.sgml        |    1 +
 docs/reference/tmpl/modest-marshal.sgml            |  112 ----------
 docs/reference/tmpl/modest-msg-view.sgml           |    1 +
 docs/reference/tmpl/modest-protocol-info.sgml      |    2 +
 docs/reference/tmpl/modest-store-widget.sgml       |    1 +
 docs/reference/tmpl/modest-tny-account-store.sgml  |   10 +-
 .../tmpl/modest-tny-platform-factory.sgml          |    1 +
 docs/reference/tmpl/modest-tny-stream-gtkhtml.sgml |    1 +
 docs/reference/tmpl/modest-transport-widget.sgml   |    1 +
 .../tmpl/modest-transport-widget.sgml.bak          |    1 +
 docs/reference/tmpl/modest-ui-actions.sgml         |   29 +--
 docs/reference/tmpl/modest-unused.sgml             |  230 ++++++++++++++++++++
 docs/reference/tmpl/modest-window-priv.sgml        |    1 +
 docs/reference/tmpl/modest-window.sgml             |    1 +
 27 files changed, 268 insertions(+), 276 deletions(-)

diff --git a/docs/reference/modest-docs.sgml b/docs/reference/modest-docs.sgml
index 76d900d..a19671c 100644
--- a/docs/reference/modest-docs.sgml
+++ b/docs/reference/modest-docs.sgml
@@ -2,24 +2,20 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
           "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
 
-<!ENTITY ModestAccountKeys SYSTEM "xml/modest-account-keys.xml">
 <!ENTITY ModestAccountMgr SYSTEM "xml/modest-account-mgr.xml">
-<!ENTITY ModestConfKeys SYSTEM "xml/modest-conf-keys.xml">
 <!ENTITY ModestConf SYSTEM "xml/modest-conf.xml">
+<!ENTITY ModestDefs SYSTEM "xml/modest-defs.xml">
 <!ENTITY ModestError SYSTEM "xml/modest-error.xml">
 <!ENTITY ModestFormatter SYSTEM "xml/modest-formatter.xml">
-<!ENTITY ModestIconFactory SYSTEM "xml/modest-icon-factory.xml">
 <!ENTITY ModestIconNames SYSTEM "xml/modest-icon-names.xml">
 <!ENTITY ModestMailOperation SYSTEM "xml/modest-mail-operation.xml">
 <!ENTITY ModestMailOperationQueue SYSTEM "xml/modest-mail-operation-queue.xml">
 <!ENTITY ModestMarshal SYSTEM "xml/modest-marshal.xml">
 <!ENTITY ModestPair SYSTEM "xml/modest-pair.xml">
-<!ENTITY ModestPresets SYSTEM "xml/modest-presets.xml">
 <!ENTITY ModestProtocolInfo SYSTEM "xml/modest-protocol-info.xml">
 <!ENTITY ModestTextUtils SYSTEM "xml/modest-text-utils.xml">
 <!ENTITY ModestTnyAccountStore SYSTEM "xml/modest-tny-account-store.xml">
 <!ENTITY ModestTnyFolder SYSTEM "xml/modest-tny-folder.xml">
-<!ENTITY ModestTnyMsgActions SYSTEM "xml/modest-tny-msg-actions.xml">
 <!ENTITY ModestTnyPlatformFactory SYSTEM "xml/modest-tny-platform-factory.xml">
 <!ENTITY ModestWidgetMemory SYSTEM "xml/modest-widget-memory.xml">
 
@@ -32,7 +28,7 @@
 
 <!ENTITY gtk-ModestAccountViewWindow SYSTEM "xml/modest-account-view-window.xml">
 <!ENTITY gtk-ModestAccountAssistant SYSTEM "xml/modest-account-assistant.xml">
-<!ENTITY gtk-ModestEditMsgWindow SYSTEM "xml/modest-edit-msg-window.xml">
+<!ENTITY gtk-ModestMsgEditWindow SYSTEM "xml/modest-msg-edit-window.xml">
 <!ENTITY gtk-ModestStoreWidget SYSTEM "xml/modest-store-widget.xml">
 <!ENTITY gtk-modestTransportWidget SYSTEM "xml/modest-transport-widget.xml">
 
@@ -72,24 +68,20 @@
     <title>API Reference</title>
       <chapter id="src">
         <title>Modest</title>
-          &ModestAccountKeys;
           &ModestAccountMgr;
-          &ModestConfKeys;
           &ModestConf;
+	  &ModestDefs;
           &ModestError;
           &ModestFormatter;
-          &ModestIconFactory;
           &ModestIconNames;
           &ModestMailOperation;
           &ModestMailOperationQueue;
           &ModestMarshal;
           &ModestPair;
-          &ModestPresets;
           &ModestProtocolInfo;
           &ModestTextUtils;
           &ModestTnyAccountStore;
           &ModestTnyFolder;
-          &ModestTnyMsgActions;
           &ModestTnyPlatformFactory;
           &ModestWidgetMemory;
       </chapter>
@@ -106,7 +98,7 @@
         <title>Gtk</title>
           &gtk-ModestAccountViewWindow;
           &gtk-ModestAccountAssistant;
-          &gtk-ModestEditMsgWindow;
+          &gtk-ModestMsgEditWindow;
           &gtk-ModestStoreWidget;
           &gtk-modestTransportWidget;
       </chapter>
diff --git a/docs/reference/tmpl/modest-account-assistant.sgml b/docs/reference/tmpl/modest-account-assistant.sgml
index a28239b..7a4f23b 100644
--- a/docs/reference/tmpl/modest-account-assistant.sgml
+++ b/docs/reference/tmpl/modest-account-assistant.sgml
@@ -24,6 +24,7 @@ ModestAccountAssistant
 
 </para>
 
+@parent: 
 
 <!-- ##### FUNCTION modest_account_assistant_new ##### -->
 <para>
diff --git a/docs/reference/tmpl/modest-account-mgr.sgml b/docs/reference/tmpl/modest-account-mgr.sgml
index 98d3644..76e4a32 100644
--- a/docs/reference/tmpl/modest-account-mgr.sgml
+++ b/docs/reference/tmpl/modest-account-mgr.sgml
@@ -24,25 +24,7 @@ ModestAccountMgr
 
 </para>
 
-
-<!-- ##### SIGNAL ModestAccountMgr::account-changed ##### -->
-<para>
-
-</para>
-
-@: 
-@: 
-@: 
-@: 
-
-<!-- ##### SIGNAL ModestAccountMgr::account-removed ##### -->
-<para>
-
-</para>
-
-@: 
-@: 
-@: 
+@parent: 
 
 <!-- ##### FUNCTION modest_account_mgr_new ##### -->
 <para>
@@ -62,7 +44,6 @@ ModestAccountMgr
 @name: 
 @store_name: 
 @transport_name: 
-@err: 
 @Returns: 
 
 
@@ -77,6 +58,8 @@ ModestAccountMgr
 @username: 
 @password: 
 @proto: 
+@security: 
+@auth: 
 @Returns: 
 
 
@@ -100,7 +83,6 @@ ModestAccountMgr
 @self: 
 @name: 
 @server_account: 
-@err: 
 @Returns: 
 
 
@@ -110,7 +92,6 @@ ModestAccountMgr
 </para>
 
 @self: 
-@err: 
 @Returns: 
 
 
@@ -134,7 +115,6 @@ ModestAccountMgr
 @self: 
 @name: 
 @server_account: 
-@err: 
 @Returns: 
 
 
@@ -147,7 +127,6 @@ ModestAccountMgr
 @name: 
 @key: 
 @server_account: 
-@err: 
 @Returns: 
 
 
@@ -160,7 +139,6 @@ ModestAccountMgr
 @name: 
 @key: 
 @server_account: 
-@err: 
 @Returns: 
 
 
@@ -173,7 +151,6 @@ ModestAccountMgr
 @name: 
 @key: 
 @server_account: 
-@err: 
 @Returns: 
 
 
@@ -187,7 +164,6 @@ ModestAccountMgr
 @key: 
 @list_type: 
 @server_account: 
-@err: 
 @Returns: 
 
 
@@ -201,7 +177,6 @@ ModestAccountMgr
 @key: 
 @val: 
 @server_account: 
-@err: 
 @Returns: 
 
 
@@ -215,7 +190,6 @@ ModestAccountMgr
 @key: 
 @val: 
 @server_account: 
-@err: 
 @Returns: 
 
 
@@ -229,7 +203,6 @@ ModestAccountMgr
 @key: 
 @val: 
 @server_account: 
-@err: 
 @Returns: 
 
 
@@ -244,7 +217,7 @@ ModestAccountMgr
 @val: 
 @list_type: 
 @server_account: 
-@err: 
+@Returns: 
 
 
 <!-- ##### FUNCTION modest_account_mgr_unset ##### -->
@@ -256,7 +229,6 @@ ModestAccountMgr
 @name: 
 @key: 
 @server_account: 
-@err: 
 @Returns: 
 
 
diff --git a/docs/reference/tmpl/modest-account-view-window.sgml b/docs/reference/tmpl/modest-account-view-window.sgml
index 31285f3..f7d491b 100644
--- a/docs/reference/tmpl/modest-account-view-window.sgml
+++ b/docs/reference/tmpl/modest-account-view-window.sgml
@@ -24,6 +24,7 @@ ModestAccountViewWindow
 
 </para>
 
+@parent: 
 
 <!-- ##### FUNCTION modest_account_view_window_new ##### -->
 <para>
diff --git a/docs/reference/tmpl/modest-account-view.sgml b/docs/reference/tmpl/modest-account-view.sgml
index 61fcfb1..57d3184 100644
--- a/docs/reference/tmpl/modest-account-view.sgml
+++ b/docs/reference/tmpl/modest-account-view.sgml
@@ -24,6 +24,7 @@ ModestAccountView
 
 </para>
 
+@parent: 
 
 <!-- ##### FUNCTION modest_account_view_new ##### -->
 <para>
diff --git a/docs/reference/tmpl/modest-combo-box.sgml b/docs/reference/tmpl/modest-combo-box.sgml
index 16c4866..927c969 100644
--- a/docs/reference/tmpl/modest-combo-box.sgml
+++ b/docs/reference/tmpl/modest-combo-box.sgml
@@ -24,13 +24,15 @@ ModestComboBox
 
 </para>
 
+@parent: 
 
 <!-- ##### FUNCTION modest_combo_box_new ##### -->
 <para>
 
 </para>
 
-@hash: 
+@pairs: 
+@id_equal_func: 
 @Returns: 
 
 
diff --git a/docs/reference/tmpl/modest-conf.sgml b/docs/reference/tmpl/modest-conf.sgml
index f3d4a72..6cbcb92 100644
--- a/docs/reference/tmpl/modest-conf.sgml
+++ b/docs/reference/tmpl/modest-conf.sgml
@@ -42,15 +42,7 @@ ModestConf
 
 </para>
 
-
-<!-- ##### SIGNAL ModestConf::key-changed ##### -->
-<para>
-
-</para>
-
-@: 
-@: 
-@: 
+@parent: 
 
 <!-- ##### FUNCTION modest_conf_new ##### -->
 <para>
@@ -151,6 +143,7 @@ ModestConf
 @val: 
 @list_type: 
 @err: 
+@Returns: 
 
 
 <!-- ##### FUNCTION modest_conf_list_subkeys ##### -->
diff --git a/docs/reference/tmpl/modest-defs.sgml b/docs/reference/tmpl/modest-defs.sgml
index f8f4ca8..5423616 100644
--- a/docs/reference/tmpl/modest-defs.sgml
+++ b/docs/reference/tmpl/modest-defs.sgml
@@ -152,13 +152,6 @@ modest-defs
 
 
 
-<!-- ##### MACRO MDOEST_ACCOUNT_REMEMBER_PWD ##### -->
-<para>
-
-</para>
-
-
-
 <!-- ##### MACRO MODEST_ACCOUNT_HOSTNAME ##### -->
 <para>
 
diff --git a/docs/reference/tmpl/modest-folder-view.sgml b/docs/reference/tmpl/modest-folder-view.sgml
index d776081..e2a783e 100644
--- a/docs/reference/tmpl/modest-folder-view.sgml
+++ b/docs/reference/tmpl/modest-folder-view.sgml
@@ -24,13 +24,13 @@ ModestFolderView
 
 </para>
 
+@parent: 
 
 <!-- ##### FUNCTION modest_folder_view_new ##### -->
 <para>
 
 </para>
 
-@account_store: 
 @query: 
 @Returns: 
 
@@ -53,25 +53,6 @@ ModestFolderView
 @Returns: 
 
 
-<!-- ##### FUNCTION modest_folder_view_rename ##### -->
-<para>
-
-</para>
-
-@self: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_folder_view_add_subfolder ##### -->
-<para>
-
-</para>
-
-@self: 
-@folder: 
-@Returns: 
-
-
 <!-- ##### FUNCTION modest_folder_view_update_model ##### -->
 <para>
 
diff --git a/docs/reference/tmpl/modest-formatter.sgml b/docs/reference/tmpl/modest-formatter.sgml
index 9779f1e..c66aa03 100644
--- a/docs/reference/tmpl/modest-formatter.sgml
+++ b/docs/reference/tmpl/modest-formatter.sgml
@@ -24,6 +24,7 @@ ModestFormatter
 
 </para>
 
+@parent: 
 
 <!-- ##### FUNCTION modest_formatter_new ##### -->
 <para>
diff --git a/docs/reference/tmpl/modest-header-view.sgml b/docs/reference/tmpl/modest-header-view.sgml
index 9d66779..8368251 100644
--- a/docs/reference/tmpl/modest-header-view.sgml
+++ b/docs/reference/tmpl/modest-header-view.sgml
@@ -66,6 +66,7 @@ ModestHeaderView
 
 </para>
 
+@parent: 
 
 <!-- ##### FUNCTION modest_header_view_new ##### -->
 <para>
@@ -84,7 +85,6 @@ ModestHeaderView
 
 @self: 
 @folder: 
-@Returns: 
 
 
 <!-- ##### FUNCTION modest_header_view_get_folder ##### -->
diff --git a/docs/reference/tmpl/modest-mail-operation-queue.sgml b/docs/reference/tmpl/modest-mail-operation-queue.sgml
index 15e970e..6ed8418 100644
--- a/docs/reference/tmpl/modest-mail-operation-queue.sgml
+++ b/docs/reference/tmpl/modest-mail-operation-queue.sgml
@@ -24,6 +24,7 @@ ModestMailOperationQueue
 
 </para>
 
+@parent: 
 
 <!-- ##### FUNCTION modest_mail_operation_queue_new ##### -->
 <para>
diff --git a/docs/reference/tmpl/modest-mail-operation.sgml b/docs/reference/tmpl/modest-mail-operation.sgml
index 9668d88..e709f36 100644
--- a/docs/reference/tmpl/modest-mail-operation.sgml
+++ b/docs/reference/tmpl/modest-mail-operation.sgml
@@ -61,13 +61,7 @@ ModestMailOperation
 
 </para>
 
-
-<!-- ##### SIGNAL ModestMailOperation::progress-changed ##### -->
-<para>
-
-</para>
-
-@: 
+@parent: 
 
 <!-- ##### FUNCTION modest_mail_operation_new ##### -->
 <para>
@@ -167,48 +161,6 @@ ModestMailOperation
 @name: 
 
 
-<!-- ##### FUNCTION modest_mail_operation_move_folder ##### -->
-<para>
-
-</para>
-
-@self: 
-@folder: 
-@parent: 
-
-
-<!-- ##### FUNCTION modest_mail_operation_copy_folder ##### -->
-<para>
-
-</para>
-
-@self: 
-@folder: 
-@parent: 
-
-
-<!-- ##### FUNCTION modest_mail_operation_copy_msg ##### -->
-<para>
-
-</para>
-
-@self: 
-@header: 
-@folder: 
-@Returns: 
-
-
-<!-- ##### FUNCTION modest_mail_operation_move_msg ##### -->
-<para>
-
-</para>
-
-@self: 
-@header: 
-@folder: 
-@Returns: 
-
-
 <!-- ##### FUNCTION modest_mail_operation_remove_msg ##### -->
 <para>
 
diff --git a/docs/reference/tmpl/modest-main-window.sgml b/docs/reference/tmpl/modest-main-window.sgml
index 150b681..d1ec297 100644
--- a/docs/reference/tmpl/modest-main-window.sgml
+++ b/docs/reference/tmpl/modest-main-window.sgml
@@ -24,6 +24,7 @@ ModestMainWindow
 
 </para>
 
+@parent: 
 
 <!-- ##### FUNCTION modest_main_window_new ##### -->
 <para>
diff --git a/docs/reference/tmpl/modest-marshal.sgml b/docs/reference/tmpl/modest-marshal.sgml
index 055b5f3..66b00d6 100644
--- a/docs/reference/tmpl/modest-marshal.sgml
+++ b/docs/reference/tmpl/modest-marshal.sgml
@@ -19,115 +19,3 @@ modest-marshal
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION modest_marshal_VOID__POINTER_POINTER ##### -->
-<para>
-
-</para>
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
-<!-- ##### FUNCTION modest_marshal_VOID__POINTER_POINTER_POINTER ##### -->
-<para>
-
-</para>
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
-<!-- ##### FUNCTION modest_marshal_VOID__POINTER_BOOLEAN ##### -->
-<para>
-
-</para>
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
-<!-- ##### MACRO modest_marshal_VOID__POINTER_BOOL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION modest_marshal_VOID__STRING_INT ##### -->
-<para>
-
-</para>
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
-<!-- ##### FUNCTION modest_marshal_VOID__STRING_INT_INT ##### -->
-<para>
-
-</para>
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
-<!-- ##### FUNCTION modest_marshal_VOID__STRING_BOOLEAN ##### -->
-<para>
-
-</para>
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
-<!-- ##### MACRO modest_marshal_VOID__STRING_BOOL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION modest_marshal_VOID__STRING_STRING_BOOLEAN ##### -->
-<para>
-
-</para>
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
-<!-- ##### MACRO modest_marshal_VOID__STRING_STRING_BOOL ##### -->
-<para>
-
-</para>
-
-
-
diff --git a/docs/reference/tmpl/modest-msg-view.sgml b/docs/reference/tmpl/modest-msg-view.sgml
index ee95a93..5e0c3ad 100644
--- a/docs/reference/tmpl/modest-msg-view.sgml
+++ b/docs/reference/tmpl/modest-msg-view.sgml
@@ -24,6 +24,7 @@ ModestMsgView
 
 </para>
 
+@parent: 
 
 <!-- ##### FUNCTION modest_msg_view_new ##### -->
 <para>
diff --git a/docs/reference/tmpl/modest-protocol-info.sgml b/docs/reference/tmpl/modest-protocol-info.sgml
index 9214187..a919423 100644
--- a/docs/reference/tmpl/modest-protocol-info.sgml
+++ b/docs/reference/tmpl/modest-protocol-info.sgml
@@ -31,8 +31,10 @@ modest-protocol-info
 @MODEST_PROTOCOL_STORE_IMAP: 
 @MODEST_PROTOCOL_STORE_MAILDIR: 
 @MODEST_PROTOCOL_STORE_MBOX: 
+@MODEST_PROTOCOL_SECURITY_NONE: 
 @MODEST_PROTOCOL_SECURITY_SSL: 
 @MODEST_PROTOCOL_SECURITY_TLS: 
+@MODEST_PROTOCOL_SECURITY_TLS_OP: 
 @MODEST_PROTOCOL_AUTH_NONE: 
 @MODEST_PROTOCOL_AUTH_PASSWORD: 
 @MODEST_PROTOCOL_NUM: 
diff --git a/docs/reference/tmpl/modest-store-widget.sgml b/docs/reference/tmpl/modest-store-widget.sgml
index 54e0fa9..c3d3e88 100644
--- a/docs/reference/tmpl/modest-store-widget.sgml
+++ b/docs/reference/tmpl/modest-store-widget.sgml
@@ -24,6 +24,7 @@ ModestStoreWidget
 
 </para>
 
+@parent: 
 
 <!-- ##### FUNCTION modest_store_widget_new ##### -->
 <para>
diff --git a/docs/reference/tmpl/modest-tny-account-store.sgml b/docs/reference/tmpl/modest-tny-account-store.sgml
index 626893d..f8f31cb 100644
--- a/docs/reference/tmpl/modest-tny-account-store.sgml
+++ b/docs/reference/tmpl/modest-tny-account-store.sgml
@@ -30,14 +30,7 @@ ModestTnyAccountStore
 
 </para>
 
-
-<!-- ##### SIGNAL ModestTnyAccountStore::account-update ##### -->
-<para>
-
-</para>
-
-@: 
-@: 
+@parent: 
 
 <!-- ##### FUNCTION modest_tny_account_store_new ##### -->
 <para>
@@ -45,6 +38,7 @@ ModestTnyAccountStore
 </para>
 
 @account_mgr: 
+@device: 
 @Returns: 
 
 
diff --git a/docs/reference/tmpl/modest-tny-platform-factory.sgml b/docs/reference/tmpl/modest-tny-platform-factory.sgml
index c9492d5..bb48028 100644
--- a/docs/reference/tmpl/modest-tny-platform-factory.sgml
+++ b/docs/reference/tmpl/modest-tny-platform-factory.sgml
@@ -24,6 +24,7 @@ ModestTnyPlatformFactory
 
 </para>
 
+@parent: 
 
 <!-- ##### FUNCTION modest_tny_platform_factory_get_instance ##### -->
 <para>
diff --git a/docs/reference/tmpl/modest-tny-stream-gtkhtml.sgml b/docs/reference/tmpl/modest-tny-stream-gtkhtml.sgml
index d073ba4..63776c9 100644
--- a/docs/reference/tmpl/modest-tny-stream-gtkhtml.sgml
+++ b/docs/reference/tmpl/modest-tny-stream-gtkhtml.sgml
@@ -24,6 +24,7 @@ ModestTnyStreamGtkhtml
 
 </para>
 
+@parent: 
 
 <!-- ##### FUNCTION modest_tny_stream_gtkhtml_new ##### -->
 <para>
diff --git a/docs/reference/tmpl/modest-transport-widget.sgml b/docs/reference/tmpl/modest-transport-widget.sgml
index b7d09dd..f2cdaab 100644
--- a/docs/reference/tmpl/modest-transport-widget.sgml
+++ b/docs/reference/tmpl/modest-transport-widget.sgml
@@ -24,6 +24,7 @@ ModestTransportWidget
 
 </para>
 
+@parent: 
 
 <!-- ##### FUNCTION modest_transport_widget_new ##### -->
 <para>
diff --git a/docs/reference/tmpl/modest-transport-widget.sgml.bak b/docs/reference/tmpl/modest-transport-widget.sgml.bak
index 8795610..d927be1 100644
--- a/docs/reference/tmpl/modest-transport-widget.sgml.bak
+++ b/docs/reference/tmpl/modest-transport-widget.sgml.bak
@@ -22,6 +22,7 @@ ModestTransportWidget
 
 </para>
 
+@parent: 
 
 <!-- ##### FUNCTION modest_transport_widget_new ##### -->
 <para>
diff --git a/docs/reference/tmpl/modest-ui-actions.sgml b/docs/reference/tmpl/modest-ui-actions.sgml
index e288767..cbb3876 100644
--- a/docs/reference/tmpl/modest-ui-actions.sgml
+++ b/docs/reference/tmpl/modest-ui-actions.sgml
@@ -34,7 +34,7 @@ modest-ui-actions
 </para>
 
 @widget: 
-@main_window: 
+@win: 
 
 
 <!-- ##### FUNCTION modest_ui_actions_on_quit ##### -->
@@ -79,7 +79,7 @@ modest-ui-actions
 </para>
 
 @widget: 
-@main_window: 
+@win: 
 
 
 <!-- ##### FUNCTION modest_ui_actions_on_forward ##### -->
@@ -88,7 +88,7 @@ modest-ui-actions
 </para>
 
 @widget: 
-@main_window: 
+@win: 
 
 
 <!-- ##### FUNCTION modest_ui_actions_on_reply_all ##### -->
@@ -97,7 +97,7 @@ modest-ui-actions
 </para>
 
 @widget: 
-@main_window: 
+@win: 
 
 
 <!-- ##### FUNCTION modest_ui_actions_on_next ##### -->
@@ -265,24 +265,3 @@ modest-ui-actions
 @main_window: 
 
 
-<!-- ##### FUNCTION modest_ui_actions_on_accounts_reloaded ##### -->
-<para>
-
-</para>
-
-@store: 
-@user_data: 
-
-
-<!-- ##### FUNCTION modest_ui_actions_on_folder_moved ##### -->
-<para>
-
-</para>
-
-@folder_view: 
-@folder: 
-@parent: 
-@done: 
-@user_data: 
-
-
diff --git a/docs/reference/tmpl/modest-unused.sgml b/docs/reference/tmpl/modest-unused.sgml
index b5d2c73..692df80 100644
--- a/docs/reference/tmpl/modest-unused.sgml
+++ b/docs/reference/tmpl/modest-unused.sgml
@@ -238,6 +238,33 @@ ModestUI
 ModestWidgetFactory
 
 
+<!-- ##### MACRO MDOEST_ACCOUNT_REMEMBER_PWD ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SIGNAL ModestAccountMgr::account-changed ##### -->
+<para>
+
+</para>
+
+@: 
+@: 
+@: 
+@:
+
+
+<!-- ##### SIGNAL ModestAccountMgr::account-removed ##### -->
+<para>
+
+</para>
+
+@: 
+@: 
+@:
+
+
 <!-- ##### ENUM ModestComboBoxType ##### -->
 <para>
 
@@ -250,6 +277,16 @@ ModestWidgetFactory
 @MODEST_COMBO_BOX_TYPE_TRANSPORTS: 
 @MODEST_COMBO_BOX_TYPE_REMOTE_STORES: 
 
+<!-- ##### SIGNAL ModestConf::key-changed ##### -->
+<para>
+
+</para>
+
+@: 
+@: 
+@:
+
+
 <!-- ##### ENUM ModestDebugFlags ##### -->
 <para>
 
@@ -280,6 +317,14 @@ ModestWidgetFactory
 @MODEST_LOCAL_FOLDER_TYPE_TRASH: 
 @MODEST_LOCAL_FOLDER_TYPE_NUM: 
 
+<!-- ##### SIGNAL ModestMailOperation::progress-changed ##### -->
+<para>
+
+</para>
+
+@:
+
+
 <!-- ##### STRUCT ModestPresets ##### -->
 <para>
 
@@ -300,6 +345,15 @@ ModestWidgetFactory
 @MODEST_PRESETS_INFO_SECURE_SMTP: 
 @MODEST_PRESETS_INFO_SECURE_INCOMING: 
 
+<!-- ##### SIGNAL ModestTnyAccountStore::account-update ##### -->
+<para>
+
+</para>
+
+@: 
+@:
+
+
 <!-- ##### SIGNAL ModestTnyAccountStore::password-requested ##### -->
 <para>
 
@@ -400,6 +454,23 @@ ModestWidgetFactory
 @self: 
 @msg: 
 
+<!-- ##### FUNCTION modest_folder_view_add_subfolder ##### -->
+<para>
+
+</para>
+
+@self: 
+@folder: 
+@Returns: 
+
+<!-- ##### FUNCTION modest_folder_view_rename ##### -->
+<para>
+
+</para>
+
+@self: 
+@Returns: 
+
 <!-- ##### MACRO modest_icon_factory_get_big_icon ##### -->
 <para>
 
@@ -459,6 +530,128 @@ ModestWidgetFactory
 
 @Returns: 
 
+<!-- ##### FUNCTION modest_mail_operation_copy_folder ##### -->
+<para>
+
+</para>
+
+@self: 
+@folder: 
+@parent: 
+
+<!-- ##### FUNCTION modest_mail_operation_copy_msg ##### -->
+<para>
+
+</para>
+
+@self: 
+@header: 
+@folder: 
+@Returns: 
+
+<!-- ##### FUNCTION modest_mail_operation_move_folder ##### -->
+<para>
+
+</para>
+
+@self: 
+@folder: 
+@parent: 
+
+<!-- ##### FUNCTION modest_mail_operation_move_msg ##### -->
+<para>
+
+</para>
+
+@self: 
+@header: 
+@folder: 
+@Returns: 
+
+<!-- ##### MACRO modest_marshal_VOID__POINTER_BOOL ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION modest_marshal_VOID__POINTER_BOOLEAN ##### -->
+<para>
+
+</para>
+
+@closure: 
+@return_value: 
+@n_param_values: 
+@param_values: 
+@invocation_hint: 
+@marshal_data: 
+
+<!-- ##### FUNCTION modest_marshal_VOID__POINTER_POINTER ##### -->
+<para>
+
+</para>
+
+@closure: 
+@return_value: 
+@n_param_values: 
+@param_values: 
+@invocation_hint: 
+@marshal_data: 
+
+<!-- ##### FUNCTION modest_marshal_VOID__POINTER_POINTER_POINTER ##### -->
+<para>
+
+</para>
+
+@closure: 
+@return_value: 
+@n_param_values: 
+@param_values: 
+@invocation_hint: 
+@marshal_data: 
+
+<!-- ##### MACRO modest_marshal_VOID__STRING_BOOL ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION modest_marshal_VOID__STRING_BOOLEAN ##### -->
+<para>
+
+</para>
+
+@closure: 
+@return_value: 
+@n_param_values: 
+@param_values: 
+@invocation_hint: 
+@marshal_data: 
+
+<!-- ##### FUNCTION modest_marshal_VOID__STRING_INT ##### -->
+<para>
+
+</para>
+
+@closure: 
+@return_value: 
+@n_param_values: 
+@param_values: 
+@invocation_hint: 
+@marshal_data: 
+
+<!-- ##### FUNCTION modest_marshal_VOID__STRING_INT_INT ##### -->
+<para>
+
+</para>
+
+@closure: 
+@return_value: 
+@n_param_values: 
+@param_values: 
+@invocation_hint: 
+@marshal_data: 
+
 <!-- ##### FUNCTION modest_marshal_VOID__STRING_POINTER_POINTER_POINTER ##### -->
 <para>
 
@@ -471,6 +664,24 @@ ModestWidgetFactory
 @invocation_hint: 
 @marshal_data: 
 
+<!-- ##### MACRO modest_marshal_VOID__STRING_STRING_BOOL ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION modest_marshal_VOID__STRING_STRING_BOOLEAN ##### -->
+<para>
+
+</para>
+
+@closure: 
+@return_value: 
+@n_param_values: 
+@param_values: 
+@invocation_hint: 
+@marshal_data: 
+
 <!-- ##### FUNCTION modest_presets_destroy ##### -->
 <para>
 
@@ -567,6 +778,25 @@ ModestWidgetFactory
 @fact: 
 @Returns: 
 
+<!-- ##### FUNCTION modest_ui_actions_on_accounts_reloaded ##### -->
+<para>
+
+</para>
+
+@store: 
+@user_data: 
+
+<!-- ##### FUNCTION modest_ui_actions_on_folder_moved ##### -->
+<para>
+
+</para>
+
+@folder_view: 
+@folder: 
+@parent: 
+@done: 
+@user_data: 
+
 <!-- ##### FUNCTION modest_ui_edit_window ##### -->
 <para>
 
diff --git a/docs/reference/tmpl/modest-window-priv.sgml b/docs/reference/tmpl/modest-window-priv.sgml
index 5927478..1e96bfe 100644
--- a/docs/reference/tmpl/modest-window-priv.sgml
+++ b/docs/reference/tmpl/modest-window-priv.sgml
@@ -27,6 +27,7 @@ modest-window-priv
 @ui_manager: 
 @toolbar: 
 @menubar: 
+@active_account: 
 
 <!-- ##### MACRO MODEST_WINDOW_GET_PRIVATE ##### -->
 <para>
diff --git a/docs/reference/tmpl/modest-window.sgml b/docs/reference/tmpl/modest-window.sgml
index 677312e..2e34089 100644
--- a/docs/reference/tmpl/modest-window.sgml
+++ b/docs/reference/tmpl/modest-window.sgml
@@ -36,4 +36,5 @@ ModestWindow
 
 </para>
 
+@parent: 
 
-- 
1.7.9.5