diff --git a/doc/C/tmpl/gda-batch.sgml b/doc/C/tmpl/gda-batch.sgml
index 526add7..c466dda 100644
--- a/doc/C/tmpl/gda-batch.sgml
+++ b/doc/C/tmpl/gda-batch.sgml
@@ -35,7 +35,6 @@ a #GdaSqlParser object.
 
 </para>
 
-@: 
 @:
 
 @gdabatch: the object which received the signal.
diff --git a/doc/C/tmpl/gda-column.sgml b/doc/C/tmpl/gda-column.sgml
index 2673d9f..9ee9247 100644
--- a/doc/C/tmpl/gda-column.sgml
+++ b/doc/C/tmpl/gda-column.sgml
@@ -33,7 +33,6 @@ Management of #GdaDataModel column attributes
 </para>
 
 @: 
-@: 
 @:
 
 @gdacolumn: the object which received the signal.
@@ -45,7 +44,6 @@ Management of #GdaDataModel column attributes
 
 </para>
 
-@: 
 @:
 
 @gdacolumn: the object which received the signal.
diff --git a/doc/C/tmpl/gda-config.sgml b/doc/C/tmpl/gda-config.sgml
index 244c0a1..e3f3fde 100644
--- a/doc/C/tmpl/gda-config.sgml
+++ b/doc/C/tmpl/gda-config.sgml
@@ -68,7 +68,6 @@ g_object_new (GDA_TYPE_CONFIG, "user-filename", "my_file", NULL);
 
 </para>
 
-@: 
 @:
 
 @gdaconfig: the object which received the signal.
@@ -79,7 +78,6 @@ g_object_new (GDA_TYPE_CONFIG, "user-filename", "my_file", NULL);
 
 </para>
 
-@: 
 @:
 
 @gdaconfig: the object which received the signal.
@@ -90,7 +88,6 @@ g_object_new (GDA_TYPE_CONFIG, "user-filename", "my_file", NULL);
 
 </para>
 
-@: 
 @:
 
 @gdaconfig: the object which received the signal.
@@ -101,7 +98,6 @@ g_object_new (GDA_TYPE_CONFIG, "user-filename", "my_file", NULL);
 
 </para>
 
-@: 
 @:
 
 @gdaconfig: the object which received the signal.
diff --git a/doc/C/tmpl/gda-connection.sgml b/doc/C/tmpl/gda-connection.sgml
index e3f0e86..6f71561 100644
--- a/doc/C/tmpl/gda-connection.sgml
+++ b/doc/C/tmpl/gda-connection.sgml
@@ -67,8 +67,6 @@ A connection to a database
 
 </para>
 
-@:
-
 @gdaconnection: the object which received the signal.
 
 <!-- ##### SIGNAL GdaConnection::conn-opened ##### -->
@@ -76,8 +74,6 @@ A connection to a database
 
 </para>
 
-@:
-
 @gdaconnection: the object which received the signal.
 
 <!-- ##### SIGNAL GdaConnection::conn-to-close ##### -->
@@ -85,8 +81,6 @@ A connection to a database
 
 </para>
 
-@:
-
 @gdaconnection: the object which received the signal.
 
 <!-- ##### SIGNAL GdaConnection::dsn-changed ##### -->
@@ -94,8 +88,6 @@ A connection to a database
 
 </para>
 
-@:
-
 @gdaconnection: the object which received the signal.
 
 <!-- ##### SIGNAL GdaConnection::error ##### -->
@@ -103,7 +95,6 @@ A connection to a database
 
 </para>
 
-@: 
 @:
 
 @gdaconnection: the object which received the signal.
@@ -114,8 +105,6 @@ A connection to a database
 
 </para>
 
-@:
-
 @gdaconnection: the object which received the signal.
 
 <!-- ##### ARG GdaConnection:auth-string ##### -->
diff --git a/doc/C/tmpl/gda-data-model-bdb.sgml b/doc/C/tmpl/gda-data-model-bdb.sgml
index 11710e2..e035941 100644
--- a/doc/C/tmpl/gda-data-model-bdb.sgml
+++ b/doc/C/tmpl/gda-data-model-bdb.sgml
@@ -32,16 +32,8 @@ virtual methods).
 
 </para>
 
-
-<!-- ##### ARG GdaDataModelBdb:db-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GdaDataModelBdb:filename ##### -->
-<para>
-
-</para>
+@object: 
+@priv: 
 
 <!-- ##### STRUCT GdaDataModelBdbClass ##### -->
 <para>
diff --git a/doc/C/tmpl/gda-data-model-iter.sgml b/doc/C/tmpl/gda-data-model-iter.sgml
index 9e47dde..f11bba0 100644
--- a/doc/C/tmpl/gda-data-model-iter.sgml
+++ b/doc/C/tmpl/gda-data-model-iter.sgml
@@ -81,8 +81,6 @@ any case it will not prevent the data model from being destroyed).
 
 </para>
 
-@:
-
 @gdadatamodeliter: the object which received the signal.
 @arg1: 
 
diff --git a/doc/C/tmpl/gda-data-proxy.sgml b/doc/C/tmpl/gda-data-proxy.sgml
index a997ca3..95f38cf 100644
--- a/doc/C/tmpl/gda-data-proxy.sgml
+++ b/doc/C/tmpl/gda-data-proxy.sgml
@@ -130,8 +130,6 @@ Proxy to hold modifications for any #GdaDataModel, and provides the #GdaDataMode
 
 </para>
 
-@:
-
 @gdadataproxy: the object which received the signal.
 
 <!-- ##### SIGNAL GdaDataProxy::row-changes-applied ##### -->
@@ -140,7 +138,6 @@ Proxy to hold modifications for any #GdaDataModel, and provides the #GdaDataMode
 </para>
 
 @: 
-@: 
 @:
 
 @gdadataproxy: the object which received the signal.
@@ -153,7 +150,6 @@ Proxy to hold modifications for any #GdaDataModel, and provides the #GdaDataMode
 </para>
 
 @: 
-@: 
 @:
 
 @gdadataproxy: the object which received the signal.
@@ -166,7 +162,6 @@ Proxy to hold modifications for any #GdaDataModel, and provides the #GdaDataMode
 </para>
 
 @: 
-@: 
 @:
 
 @gdadataproxy: the object which received the signal.
@@ -178,7 +173,6 @@ Proxy to hold modifications for any #GdaDataModel, and provides the #GdaDataMode
 
 </para>
 
-@: 
 @:
 
 @gdadataproxy: the object which received the signal.
@@ -190,7 +184,6 @@ Proxy to hold modifications for any #GdaDataModel, and provides the #GdaDataMode
 </para>
 
 @: 
-@: 
 @:
 
 @Returns: 
diff --git a/doc/C/tmpl/gda-sql-parser.sgml b/doc/C/tmpl/gda-sql-parser.sgml
index 18c46b9..071a374 100644
--- a/doc/C/tmpl/gda-sql-parser.sgml
+++ b/doc/C/tmpl/gda-sql-parser.sgml
@@ -110,11 +110,6 @@ ALTER GROUP mygroup ADD USER ##name::gchararray;
 Internal usage only.
 </para>
 
-<!-- ##### ARG GdaSqlParser:debug ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GdaSqlParser:line-error ##### -->
 <para>
 Internal usage only.
diff --git a/doc/C/tmpl/gda-vconnection-data-model.sgml b/doc/C/tmpl/gda-vconnection-data-model.sgml
index 1702e55..f493a01 100644
--- a/doc/C/tmpl/gda-vconnection-data-model.sgml
+++ b/doc/C/tmpl/gda-vconnection-data-model.sgml
@@ -28,6 +28,22 @@ The #GdaVproviderDataModel provider to use to create such connection objects.
 </para>
 
 
+<!-- ##### SIGNAL GdaVconnectionDataModel::vtable-created ##### -->
+<para>
+
+</para>
+
+@gdavconnectiondatamodel: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL GdaVconnectionDataModel::vtable-dropped ##### -->
+<para>
+
+</para>
+
+@gdavconnectiondatamodel: the object which received the signal.
+@arg1: 
+
 <!-- ##### USER_FUNCTION GdaVconnectionDataModelFunc ##### -->
 <para>
 
@@ -124,6 +140,16 @@ The #GdaVproviderDataModel provider to use to create such connection objects.
 @Returns: 
 
 
+<!-- ##### FUNCTION gda_vconnection_data_model_get ##### -->
+<para>
+
+</para>
+
+@cnc: 
+@table_name: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gda_vconnection_data_model_foreach ##### -->
 <para>
 
diff --git a/doc/C/tmpl/gdaui-rt-editor.sgml b/doc/C/tmpl/gdaui-rt-editor.sgml
index 185505e..bc5672a 100644
--- a/doc/C/tmpl/gdaui-rt-editor.sgml
+++ b/doc/C/tmpl/gdaui-rt-editor.sgml
@@ -54,6 +54,11 @@ Nice Picture: [[[R2RrUAA...y8vLy8tYQwAA]]] Yes
 
 </para>
 
+<!-- ##### ARG GdauiRtEditor:in-scrolled-window ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GdauiRtEditor:no-background ##### -->
 <para>
 
diff --git a/libgda-ui/gdaui-tree-store.c b/libgda-ui/gdaui-tree-store.c
index 7587837..f8fb59d 100644
--- a/libgda-ui/gdaui-tree-store.c
+++ b/libgda-ui/gdaui-tree-store.c
@@ -386,7 +386,7 @@ gdaui_tree_store_get_property (GObject *object,
 }
 
 /**
- * gdaui_tree_store_new
+ * gdaui_tree_store_new: (skip)
  * @tree: a #GdaTree object
  * @n_columns: number of columns in the tree store
  * @Varargs: couples of (GType, attribute name) for each column, from first to last 
diff --git a/libgda/gda-connection.c b/libgda/gda-connection.c
index 6ad04a4..455a637 100644
--- a/libgda/gda-connection.c
+++ b/libgda/gda-connection.c
@@ -1747,7 +1747,7 @@ gda_connection_get_authentication (GdaConnection *cnc)
 }
 
 /**
- * gda_connection_insert_row_into_table:
+ * gda_connection_insert_row_into_table: (skip)
  * @cnc: an opened connection
  * @table: table's name to insert into
  * @error: a place to store errors, or %NULL
@@ -1913,7 +1913,7 @@ gda_connection_insert_row_into_table_v (GdaConnection *cnc, const gchar *table,
 }
 
 /**
- * gda_connection_update_row_in_table:
+ * gda_connection_update_row_in_table: (skip)
  * @cnc: an opened connection
  * @table: the table's name with the row's values to be updated
  * @condition_column_name: the name of the column to used in the WHERE condition clause
@@ -2392,7 +2392,7 @@ gda_connection_add_event (GdaConnection *cnc, GdaConnectionEvent *event)
 }
 
 /**
- * gda_connection_add_event_string:
+ * gda_connection_add_event_string: (skip)
  * @cnc: a #GdaConnection object.
  * @str: a format string (see the printf(3) documentation).
  * @...: the arguments to insert in the error message.
@@ -3415,7 +3415,7 @@ gda_connection_statement_execute_select (GdaConnection *cnc, GdaStatement *stmt,
 }
 
 /**
- * gda_connection_statement_execute_select_fullv:
+ * gda_connection_statement_execute_select_fullv: (skip)
  * @cnc: a #GdaConnection object.
  * @stmt: a #GdaStatement object.
  * @params: (allow-none): a #GdaSet object (which can be obtained using gda_statement_get_parameters()), or %NULL
@@ -5216,7 +5216,7 @@ prepare_meta_statements_hash (void)
 }
 
 /**
- * gda_connection_get_meta_store_data:
+ * gda_connection_get_meta_store_data: (skip)
  * @cnc: a #GdaConnection object.
  * @meta_type: describes which data to get.
  * @error: a place to store errors, or %NULL
diff --git a/libgda/gda-data-model-array.c b/libgda/gda-data-model-array.c
index 4cc00ea..b0a2df8 100644
--- a/libgda/gda-data-model-array.c
+++ b/libgda/gda-data-model-array.c
@@ -283,7 +283,7 @@ gda_data_model_array_new (gint cols)
 }
 
 /**
- * gda_data_model_array_new_with_g_types:
+ * gda_data_model_array_new_with_g_types: (skip)
  * @cols: number of columns for rows in this data model.
  * @...: types of the columns of the model to create as #GType, as many as indicated by @cols
  * 
diff --git a/libgda/gda-easy.c b/libgda/gda-easy.c
index 83a129e..634fa30 100644
--- a/libgda/gda-easy.c
+++ b/libgda/gda-easy.c
@@ -155,7 +155,7 @@ gda_execute_non_select_command (GdaConnection *cnc, const gchar *sql, GError **e
 }
 
 /**
- * gda_prepare_create_table:
+ * gda_prepare_create_table: (skip)
  * @cnc: an opened connection
  * @table_name: name of the table to create
  * @error: a place to store errors, or %NULL
@@ -417,7 +417,7 @@ gda_get_default_handler (GType for_type)
 }
 
 /**
- * gda_insert_row_into_table:
+ * gda_insert_row_into_table: (skip)
  * @cnc: an opened connection
  * @table: table's name to insert into
  * @error: a place to store errors, or %NULL
@@ -500,7 +500,7 @@ gda_insert_row_into_table_v (GdaConnection *cnc, const gchar *table,
 
 
 /**
- * gda_update_row_in_table:
+ * gda_update_row_in_table: (skip)
  * @cnc: an opened connection
  * @table: the table's name with the row's values to be updated
  * @condition_column_name: the name of the column to used in the WHERE condition clause
diff --git a/libgda/gda-holder.c b/libgda/gda-holder.c
index 0cd9515..4db44d5 100644
--- a/libgda/gda-holder.c
+++ b/libgda/gda-holder.c
@@ -401,7 +401,7 @@ gda_holder_copy (GdaHolder *orig)
 }
 
 /**
- * gda_holder_new_inline:
+ * gda_holder_new_inline: (skip)
  * @type: a valid GLib type
  * @id: the id of the holder to create, or %NULL
  * @...: value to set
diff --git a/libgda/gda-log.c b/libgda/gda-log.c
index 3dca2de..b2b783f 100644
--- a/libgda/gda-log.c
+++ b/libgda/gda-log.c
@@ -87,7 +87,7 @@ gda_log_is_enabled (void)
 }
 
 /**
- * gda_log_message:
+ * gda_log_message: (skip)
  * @format: format string (see the printf(3) documentation).
  * @...: arguments to insert in the message.
  *
diff --git a/libgda/gda-meta-store.c b/libgda/gda-meta-store.c
index a342d9f..57e269a 100644
--- a/libgda/gda-meta-store.c
+++ b/libgda/gda-meta-store.c
@@ -2300,7 +2300,7 @@ gda_meta_store_sql_identifier_quote (const gchar *id, GdaConnection *cnc)
 }
 
 /**
- * gda_meta_store_extract:
+ * gda_meta_store_extract: (skip)
  * @store: a #GdaMetaStore object
  * @select_sql: a SELECT statement
  * @error: (allow-none): a place to store errors, or %NULL
@@ -2427,7 +2427,7 @@ static gboolean gda_meta_store_modify_v (GdaMetaStore *store, const gchar *table
 					 gint nvalues, const gchar **value_names, const GValue **values);
 
 /**
- * gda_meta_store_modify:
+ * gda_meta_store_modify: (skip)
  * @store: a #GdaMetaStore object
  * @table_name: the name of the table to modify within @store
  * @new_data: (allow-none): a #GdaDataModel containing the new data to set in @table_name, or %NULL (treated as a data model
diff --git a/libgda/gda-server-operation.c b/libgda/gda-server-operation.c
index 80c4b08..997eaba 100644
--- a/libgda/gda-server-operation.c
+++ b/libgda/gda-server-operation.c
@@ -2038,7 +2038,7 @@ real_gda_server_operation_get_value_at (GdaServerOperation *op, const gchar *pat
 }
 
 /**
- * gda_server_operation_get_value_at:
+ * gda_server_operation_get_value_at: (skip)
  * @op: a #GdaServerOperation object
  * @path_format: a complete path to a node (starting with "/")
  * @...: arguments to use with @path_format to make a complete path
@@ -2071,7 +2071,7 @@ gda_server_operation_get_value_at (GdaServerOperation *op, const gchar *path_for
 }
 
 /**
- * gda_server_operation_get_sql_identifier_at:
+ * gda_server_operation_get_sql_identifier_at: (skip)
  * @op: a #GdaServerOperation object
  * @cnc: a #GdaConnection, or %NULL
  * @prov: a #GdaServerProvider, or %NULL
@@ -2119,7 +2119,7 @@ gda_server_operation_get_sql_identifier_at (GdaServerOperation *op, GdaConnectio
 }
 
 /**
- * gda_server_operation_set_value_at:
+ * gda_server_operation_set_value_at: (skip)
  * @op: a #GdaServerOperation object
  * @value: a string
  * @error: a place to store errors or %NULL
@@ -2526,7 +2526,7 @@ gda_server_operation_perform_drop_database (GdaServerOperation *op, const gchar
 }
 
 /**
- * gda_server_operation_prepare_create_table:
+ * gda_server_operation_prepare_create_table: (skip)
  * @cnc: an opened connection
  * @table_name: name of the table to create
  * @error: a place to store errors, or %NULL
diff --git a/libgda/gda-set.c b/libgda/gda-set.c
index 1b98dda..21510f3 100644
--- a/libgda/gda-set.c
+++ b/libgda/gda-set.c
@@ -473,7 +473,7 @@ gda_set_copy (GdaSet *set)
 }
 
 /**
- * gda_set_new_inline:
+ * gda_set_new_inline: (skip)
  * @nb: the number of value holders which will be contained in the new #GdaSet
  * @...: a serie of a (const gchar*) id, (GType) type, and value
  *
@@ -584,7 +584,7 @@ gda_set_new_inline (gint nb, ...)
 }
 
 /**
- * gda_set_set_holder_value:
+ * gda_set_set_holder_value: (skip)
  * @set: a #GdaSet object
  * @error: (allow-none): a place to store errors, or %NULL
  * @holder_id: the ID of the holder to set the value
diff --git a/libgda/gda-sql-builder.c b/libgda/gda-sql-builder.c
index ec2ac95..aa6a827 100644
--- a/libgda/gda-sql-builder.c
+++ b/libgda/gda-sql-builder.c
@@ -595,7 +595,7 @@ create_typed_value (GType type, va_list *ap)
 }
 
 /**
- * gda_sql_builder_add_field_value:
+ * gda_sql_builder_add_field_value: (skip)
  * @builder: a #GdaSqlBuilder object
  * @field_name: a field name
  * @type: the GType of the following argument
@@ -845,7 +845,7 @@ gda_sql_builder_add_expr_value (GdaSqlBuilder *builder, GdaDataHandler *dh, cons
 }
 
 /**
- * gda_sql_builder_add_expr:
+ * gda_sql_builder_add_expr: (skip)
  * @builder: a #GdaSqlBuilder object
  * @dh: a #GdaDataHandler to use, or %NULL
  * @type: the GType of the following argument
@@ -1624,7 +1624,7 @@ gda_sql_builder_select_group_by (GdaSqlBuilder *builder, GdaSqlBuilderId expr_id
 }
 
 /**
- * gda_sql_builder_add_function:
+ * gda_sql_builder_add_function: (skip)
  * @builder: a #GdaSqlBuilder object
  * @func_name: the functions's name
  * @...: a list, terminated with %0, of each function's argument's ID
@@ -1806,7 +1806,7 @@ gda_sql_builder_compound_add_sub_select (GdaSqlBuilder *builder, GdaSqlStatement
 }
 
 /**
- * gda_sql_builder_add_case:
+ * gda_sql_builder_add_case: (skip)
  * @builder: a #GdaSqlBuilder object
  * @test_expr: the expression ID representing the test of the CASE, or %0
  * @else_expr: the expression ID representing the ELSE expression, or %0
diff --git a/libgda/gda-util.c b/libgda/gda-util.c
index 9645950..500b64b 100644
--- a/libgda/gda-util.c
+++ b/libgda/gda-util.c
@@ -265,7 +265,7 @@ gda_default_unescape_string (const gchar *string)
 }
 
 /**
- * gda_utility_check_data_model
+ * gda_utility_check_data_model: (skip)
  * @model: a #GdaDataModel object
  * @nbcols: the minimum requested number of columns
  * @Varargs: @nbcols arguments of type GType or -1 (if any data type is accepted)
diff --git a/tools/browser/doc/tmpl/ui-formgrid.sgml b/tools/browser/doc/tmpl/ui-formgrid.sgml
index cc213be..2613cb9 100644
--- a/tools/browser/doc/tmpl/ui-formgrid.sgml
+++ b/tools/browser/doc/tmpl/ui-formgrid.sgml
@@ -36,6 +36,11 @@ Widget embedding both a form and a grid to display a #GdaDataModel's contents
 
 </para>
 
+<!-- ##### ARG UiFormGrid:scroll-form ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG UiFormGrid:widget-info ##### -->
 <para>
 
@@ -47,6 +52,7 @@ Widget embedding both a form and a grid to display a #GdaDataModel's contents
 </para>
 
 @model: 
+@scroll_form: 
 @flags: 
 @Returns: 
 
