sync docs

14 files changed, 263 insertions, 504 deletions

diff --git a/docs/tmpl/atk-unused.sgml b/docs/tmpl/atk-unused.sgml
index e69de29..bed3c3f 100644
--- a/docs/tmpl/atk-unused.sgml
+++ b/docs/tmpl/atk-unused.sgml
@@ -0,0 +1,200 @@
+<!-- ##### SECTION ./tmpl/atk.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/atk.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/atk.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/atk.sgml:Title ##### -->
+atk
+
+
+<!-- ##### STRUCT AtkAttribute ##### -->
+<para>
+
+</para>
+
+@name: 
+@value: 
+
+<!-- ##### TYPEDEF AtkAttributeSet ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ENUM AtkLayer ##### -->
+<para>
+
+</para>
+
+@ATK_LAYER_INVALID: 
+@ATK_LAYER_BACKGROUND: 
+@ATK_LAYER_CANVAS: 
+@ATK_LAYER_WIDGET: 
+@ATK_LAYER_MDI: 
+@ATK_LAYER_POPUP: 
+@ATK_LAYER_OVERLAY: 
+
+<!-- ##### ENUM AtkTextAttribute ##### -->
+<para>
+
+</para>
+
+@ATK_TEXT_ATTR_LEFT_MARGIN: 
+@ATK_TEXT_ATTR_RIGHT_MARGIN: 
+@ATK_TEXT_ATTR_INDENT: 
+@ATK_TEXT_ATTR_INVISIBLE: 
+@ATK_TEXT_ATTR_EDITABLE: 
+@ATK_TEXT_ATTR_PIXELS_ABOVE_LINES: 
+@ATK_TEXT_ATTR_PIXELS_BELOW_LINES: 
+@ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP: 
+@ATK_TEXT_ATTR_BG_FULL_HEIGHT: 
+@ATK_TEXT_ATTR_RISE: 
+@ATK_TEXT_ATTR_UNDERLINE: 
+@ATK_TEXT_ATTR_STRIKETHROUGH: 
+@ATK_TEXT_ATTR_SIZE: 
+@ATK_TEXT_ATTR_SCALE: 
+@ATK_TEXT_ATTR_WEIGHT: 
+@ATK_TEXT_ATTR_LANGUAGE: 
+@ATK_TEXT_ATTR_FAMILY_NAME: 
+@ATK_TEXT_ATTR_BG_COLOR: 
+@ATK_TEXT_ATTR_FG_COLOR: 
+@ATK_TEXT_ATTR_BG_STIPPLE: 
+@ATK_TEXT_ATTR_FG_STIPPLE: 
+@ATK_TEXT_ATTR_WRAP_MODE: 
+@ATK_TEXT_ATTR_DIRECTION: 
+@ATK_TEXT_ATTR_JUSTIFICATION: 
+@ATK_TEXT_ATTR_STRETCH: 
+@ATK_TEXT_ATTR_VARIANT: 
+@ATK_TEXT_ATTR_STYLE: 
+
+<!-- ##### FUNCTION atk_attribute_get_name ##### -->
+<para>
+
+</para>
+
+@attr: 
+@Returns: 
+
+<!-- ##### FUNCTION atk_attribute_get_value ##### -->
+<para>
+
+</para>
+
+@attr: 
+@index: 
+@Returns: 
+
+<!-- ##### FUNCTION atk_attribute_set_free ##### -->
+<para>
+
+</para>
+
+@attrib_set: 
+
+<!-- ##### FUNCTION atk_object_get_layer ##### -->
+<para>
+
+</para>
+
+@accessible: 
+@Returns: 
+
+<!-- ##### FUNCTION atk_object_get_mdi_zorder ##### -->
+<para>
+
+</para>
+
+@accessible: 
+@Returns: 
+
+<!-- ##### FUNCTION atk_object_notify_state_change ##### -->
+<para>
+
+</para>
+
+@accessible: 
+@state: 
+@value: 
+
+<!-- ##### FUNCTION atk_relation_type_for_name ##### -->
+<para>
+
+</para>
+
+@name: 
+@Returns: 
+
+<!-- ##### FUNCTION atk_relation_type_get_name ##### -->
+<para>
+
+</para>
+
+@type: 
+@Returns: 
+
+<!-- ##### FUNCTION atk_table_add_column_selection ##### -->
+<para>
+
+</para>
+
+@table: 
+@column: 
+@Returns: 
+
+<!-- ##### FUNCTION atk_table_add_row_selection ##### -->
+<para>
+
+</para>
+
+@table: 
+@row: 
+@Returns: 
+
+<!-- ##### FUNCTION atk_table_remove_column_selection ##### -->
+<para>
+
+</para>
+
+@table: 
+@column: 
+@Returns: 
+
+<!-- ##### FUNCTION atk_table_remove_row_selection ##### -->
+<para>
+
+</para>
+
+@table: 
+@row: 
+@Returns: 
+
+<!-- ##### FUNCTION atk_text_get_default_attributes ##### -->
+<para>
+
+</para>
+
+@text: 
+@Returns: 
+
+<!-- ##### FUNCTION atk_text_get_run_attributes ##### -->
+<para>
+
+</para>
+
+@text: 
+@offset: 
+@start_offset: 
+@end_offset: 
+@Returns: 
+
diff --git a/docs/tmpl/atkaction.sgml b/docs/tmpl/atkaction.sgml
index 668cdb9..8f3a2f2 100644
--- a/docs/tmpl/atkaction.sgml
+++ b/docs/tmpl/atkaction.sgml
@@ -29,9 +29,7 @@ AtkAction
 @do_action: 
 @get_n_actions: 
 @get_description: 
-@get_name: 
 @get_keybinding: 
-@set_description: 
 
 <!-- ##### FUNCTION atk_action_do_action ##### -->
 <para>
@@ -40,6 +38,7 @@ AtkAction
 
 @action: 
 @i: 
+<!-- # Unused Parameters # -->
 @Returns: 
 
 
@@ -62,16 +61,6 @@ AtkAction
 @Returns: 
 
 
-<!-- ##### FUNCTION atk_action_get_name ##### -->
-<para>
-
-</para>
-
-@action: 
-@i: 
-@Returns: 
-
-
 <!-- ##### FUNCTION atk_action_get_keybinding ##### -->
 <para>
 
@@ -82,14 +71,3 @@ AtkAction
 @Returns: 
 
 
-<!-- ##### FUNCTION atk_action_set_description ##### -->
-<para>
-
-</para>
-
-@action: 
-@i: 
-@desc: 
-@Returns: 
-
-
diff --git a/docs/tmpl/atkcomponent.sgml b/docs/tmpl/atkcomponent.sgml
index 046d8d4..27ba2d7 100644
--- a/docs/tmpl/atkcomponent.sgml
+++ b/docs/tmpl/atkcomponent.sgml
@@ -28,9 +28,10 @@ AtkComponent
 @parent: 
 @add_focus_handler: 
 @contains: 
-@ref_accessible_at_point: 
+@get_accessible_at_point: 
 @get_extents: 
 @get_position: 
+@get_position_on_screen: 
 @get_size: 
 @grab_focus: 
 @remove_focus_handler: 
@@ -56,8 +57,9 @@ AtkComponent
 @component: 
 @x: 
 @y: 
-@coord_type: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@coord_type: 
 
 
 <!-- ##### FUNCTION atk_component_get_extents ##### -->
@@ -70,6 +72,7 @@ AtkComponent
 @y: 
 @width: 
 @height: 
+<!-- # Unused Parameters # -->
 @coord_type: 
 
 
@@ -81,6 +84,7 @@ AtkComponent
 @component: 
 @x: 
 @y: 
+<!-- # Unused Parameters # -->
 @coord_type: 
 
 
@@ -100,18 +104,7 @@ AtkComponent
 </para>
 
 @component: 
-@Returns: 
-
-
-<!-- ##### FUNCTION atk_component_ref_accessible_at_point ##### -->
-<para>
-
-</para>
-
-@component: 
-@x: 
-@y: 
-@coord_type: 
+<!-- # Unused Parameters # -->
 @Returns: 
 
 
@@ -134,6 +127,7 @@ AtkComponent
 @y: 
 @width: 
 @height: 
+<!-- # Unused Parameters # -->
 @coord_type: 
 @Returns: 
 
@@ -146,6 +140,7 @@ AtkComponent
 @component: 
 @x: 
 @y: 
+<!-- # Unused Parameters # -->
 @coord_type: 
 @Returns: 
 
@@ -158,6 +153,7 @@ AtkComponent
 @component: 
 @width: 
 @height: 
+<!-- # Unused Parameters # -->
 @Returns: 
 
 
diff --git a/docs/tmpl/atkdocument.sgml b/docs/tmpl/atkdocument.sgml
index 5972540..5d7ef8d 100644
--- a/docs/tmpl/atkdocument.sgml
+++ b/docs/tmpl/atkdocument.sgml
@@ -14,36 +14,3 @@ AtkDocument
 
 </para>
 
-<!-- ##### STRUCT AtkDocument ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT AtkDocumentIface ##### -->
-<para>
-
-</para>
-
-@parent: 
-@get_document_type: 
-@get_document: 
-
-<!-- ##### FUNCTION atk_document_get_document_type ##### -->
-<para>
-
-</para>
-
-@document: 
-@Returns: 
-
-
-<!-- ##### FUNCTION atk_document_get_document ##### -->
-<para>
-
-</para>
-
-@document: 
-@Returns: 
-
-
diff --git a/docs/tmpl/atkeditabletext.sgml b/docs/tmpl/atkeditabletext.sgml
index c577880..8516991 100644
--- a/docs/tmpl/atkeditabletext.sgml
+++ b/docs/tmpl/atkeditabletext.sgml
@@ -26,7 +26,7 @@ AtkEditableText
 </para>
 
 @parent_interface: 
-@set_run_attributes: 
+@set_attributes: 
 @set_text_contents: 
 @insert_text: 
 @copy_text: 
@@ -34,18 +34,6 @@ AtkEditableText
 @delete_text: 
 @paste_text: 
 
-<!-- ##### FUNCTION atk_editable_text_set_run_attributes ##### -->
-<para>
-
-</para>
-
-@text: 
-@attrib_set: 
-@start_offset: 
-@end_offset: 
-@Returns: 
-
-
 <!-- ##### FUNCTION atk_editable_text_set_text_contents ##### -->
 <para>
 
diff --git a/docs/tmpl/atkimage.sgml b/docs/tmpl/atkimage.sgml
index e6558cc..87fd805 100644
--- a/docs/tmpl/atkimage.sgml
+++ b/docs/tmpl/atkimage.sgml
@@ -26,22 +26,12 @@ AtkImage
 </para>
 
 @parent: 
-@get_image_position: 
+@get_storage_type: 
 @get_image_description: 
-@get_image_size: 
+@get_image_height: 
+@get_image_width: 
 @set_image_description: 
 
-<!-- ##### FUNCTION atk_image_get_image_position ##### -->
-<para>
-
-</para>
-
-@image: 
-@x: 
-@y: 
-@coord_type: 
-
-
 <!-- ##### FUNCTION atk_image_get_image_description ##### -->
 <para>
 
@@ -61,13 +51,3 @@ AtkImage
 @Returns: 
 
 
-<!-- ##### FUNCTION atk_image_get_image_size ##### -->
-<para>
-
-</para>
-
-@image: 
-@width: 
-@height: 
-
-
diff --git a/docs/tmpl/atkobject.sgml b/docs/tmpl/atkobject.sgml
index 164a459..4f99cf3 100644
--- a/docs/tmpl/atkobject.sgml
+++ b/docs/tmpl/atkobject.sgml
@@ -25,7 +25,6 @@ AtkObject
 @accessible_parent: 
 @role: 
 @relation_set: 
-@layer: 
 
 <!-- ##### ENUM AtkRole ##### -->
 <para>
@@ -91,13 +90,11 @@ AtkObject
 @ATK_ROLE_TABLE_COLUMN_HEADER: 
 @ATK_ROLE_TABLE_ROW_HEADER: 
 @ATK_ROLE_TEAR_OFF_MENU_ITEM: 
-@ATK_ROLE_TERMINAL: 
 @ATK_ROLE_TEXT: 
 @ATK_ROLE_TOGGLE_BUTTON: 
 @ATK_ROLE_TOOL_BAR: 
 @ATK_ROLE_TOOL_TIP: 
 @ATK_ROLE_TREE: 
-@ATK_ROLE_TREE_TABLE: 
 @ATK_ROLE_UNKNOWN: 
 @ATK_ROLE_VIEWPORT: 
 @ATK_ROLE_WINDOW: 
@@ -112,19 +109,6 @@ AtkObject
 @Returns: 
 
 
-<!-- ##### ENUM AtkLayer ##### -->
-<para>
-
-</para>
-
-@ATK_LAYER_INVALID: 
-@ATK_LAYER_BACKGROUND: 
-@ATK_LAYER_CANVAS: 
-@ATK_LAYER_WIDGET: 
-@ATK_LAYER_MDI: 
-@ATK_LAYER_POPUP: 
-@ATK_LAYER_OVERLAY: 
-
 <!-- ##### STRUCT AtkImplementor ##### -->
 <para>
 
@@ -229,24 +213,6 @@ AtkObject
 @Returns: 
 
 
-<!-- ##### FUNCTION atk_object_get_layer ##### -->
-<para>
-
-</para>
-
-@accessible: 
-@Returns: 
-
-
-<!-- ##### FUNCTION atk_object_get_mdi_zorder ##### -->
-<para>
-
-</para>
-
-@accessible: 
-@Returns: 
-
-
 <!-- ##### FUNCTION atk_object_get_role ##### -->
 <para>
 
@@ -329,13 +295,3 @@ AtkObject
 @handler_id: 
 
 
-<!-- ##### FUNCTION atk_object_notify_state_change ##### -->
-<para>
-
-</para>
-
-@accessible: 
-@state: 
-@value: 
-
-
diff --git a/docs/tmpl/atkrelation.sgml b/docs/tmpl/atkrelation.sgml
index f0041ae..d3fb4ef 100644
--- a/docs/tmpl/atkrelation.sgml
+++ b/docs/tmpl/atkrelation.sgml
@@ -34,7 +34,6 @@ AtkRelation
 @ATK_RELATION_LABEL_FOR: 
 @ATK_RELATION_LABELLED_BY: 
 @ATK_RELATION_MEMBER_OF: 
-@ATK_RELATION_NODE_CHILD_OF: 
 @ATK_RELATION_LAST_DEFINED: 
 
 <!-- ##### FUNCTION atk_relation_type_register ##### -->
@@ -46,24 +45,6 @@ AtkRelation
 @Returns: 
 
 
-<!-- ##### FUNCTION atk_relation_type_get_name ##### -->
-<para>
-
-</para>
-
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION atk_relation_type_for_name ##### -->
-<para>
-
-</para>
-
-@name: 
-@Returns: 
-
-
 <!-- ##### FUNCTION atk_relation_new ##### -->
 <para>
 
diff --git a/docs/tmpl/atkselection.sgml b/docs/tmpl/atkselection.sgml
index fdeb7b7..6989f53 100644
--- a/docs/tmpl/atkselection.sgml
+++ b/docs/tmpl/atkselection.sgml
@@ -33,7 +33,6 @@ AtkSelection
 @is_child_selected: 
 @remove_selection: 
 @select_all_selection: 
-@selection_changed: 
 
 <!-- ##### FUNCTION atk_selection_add_selection ##### -->
 <para>
@@ -42,6 +41,7 @@ AtkSelection
 
 @selection: 
 @i: 
+<!-- # Unused Parameters # -->
 @Returns: 
 
 
@@ -51,6 +51,7 @@ AtkSelection
 </para>
 
 @selection: 
+<!-- # Unused Parameters # -->
 @Returns: 
 
 
@@ -90,6 +91,7 @@ AtkSelection
 
 @selection: 
 @i: 
+<!-- # Unused Parameters # -->
 @Returns: 
 
 
@@ -99,6 +101,7 @@ AtkSelection
 </para>
 
 @selection: 
+<!-- # Unused Parameters # -->
 @Returns: 
 
 
diff --git a/docs/tmpl/atkstate.sgml b/docs/tmpl/atkstate.sgml
index e29a4da..c056695 100644
--- a/docs/tmpl/atkstate.sgml
+++ b/docs/tmpl/atkstate.sgml
@@ -24,9 +24,9 @@ AtkState
 @ATK_STATE_ARMED: 
 @ATK_STATE_BUSY: 
 @ATK_STATE_CHECKED: 
+@ATK_STATE_COLLAPSED: 
 @ATK_STATE_DEFUNCT: 
 @ATK_STATE_EDITABLE: 
-@ATK_STATE_ENABLED: 
 @ATK_STATE_EXPANDABLE: 
 @ATK_STATE_EXPANDED: 
 @ATK_STATE_FOCUSABLE: 
@@ -44,7 +44,6 @@ AtkState
 @ATK_STATE_SENSITIVE: 
 @ATK_STATE_SHOWING: 
 @ATK_STATE_SINGLE_LINE: 
-@ATK_STATE_STALE: 
 @ATK_STATE_TRANSIENT: 
 @ATK_STATE_VERTICAL: 
 @ATK_STATE_VISIBLE: 
diff --git a/docs/tmpl/atkstreamablecontent.sgml b/docs/tmpl/atkstreamablecontent.sgml
index 5cef56f..1e49462 100644
--- a/docs/tmpl/atkstreamablecontent.sgml
+++ b/docs/tmpl/atkstreamablecontent.sgml
@@ -14,48 +14,3 @@ AtkStreamableContent
 
 </para>
 
-<!-- ##### STRUCT AtkStreamableContent ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT AtkStreamableContentIface ##### -->
-<para>
-
-</para>
-
-@parent: 
-@get_n_mime_types: 
-@get_mime_type: 
-@get_stream: 
-
-<!-- ##### FUNCTION atk_streamable_content_get_n_mime_types ##### -->
-<para>
-
-</para>
-
-@streamable: 
-@Returns: 
-
-
-<!-- ##### FUNCTION atk_streamable_content_get_mime_type ##### -->
-<para>
-
-</para>
-
-@streamable: 
-@i: 
-@Returns: 
-
-
-<!-- ##### FUNCTION atk_streamable_content_get_stream ##### -->
-<para>
-
-</para>
-
-@streamable: 
-@mime_type: 
-@Returns: 
-
-
diff --git a/docs/tmpl/atktable.sgml b/docs/tmpl/atktable.sgml
index 0ed4e6d..a1b1fcc 100644
--- a/docs/tmpl/atktable.sgml
+++ b/docs/tmpl/atktable.sgml
@@ -28,40 +28,29 @@ AtkTable
 @parent: 
 @ref_at: 
 @get_index_at: 
-@get_column_at_index: 
 @get_row_at_index: 
-@get_n_columns: 
-@get_n_rows: 
-@get_column_extent_at: 
-@get_row_extent_at: 
+@get_column_at_index: 
 @get_caption: 
+@get_n_columns: 
 @get_column_description: 
+@get_column_extent_at: 
 @get_column_header: 
+@get_n_rows: 
 @get_row_description: 
+@get_row_extent_at: 
 @get_row_header: 
 @get_summary: 
+@get_selected_columns: 
+@get_selected_rows: 
+@is_column_selected: 
+@is_row_selected: 
+@is_selected: 
 @set_caption: 
 @set_column_description: 
 @set_column_header: 
 @set_row_description: 
 @set_row_header: 
 @set_summary: 
-@get_selected_columns: 
-@get_selected_rows: 
-@is_column_selected: 
-@is_row_selected: 
-@is_selected: 
-@add_row_selection: 
-@remove_row_selection: 
-@add_column_selection: 
-@remove_column_selection: 
-@row_inserted: 
-@column_inserted: 
-@row_deleted: 
-@column_deleted: 
-@row_reordered: 
-@column_reordered: 
-@model_changed: 
 
 <!-- ##### FUNCTION atk_table_ref_at ##### -->
 <para>
@@ -170,8 +159,10 @@ AtkTable
 </para>
 
 @table: 
-@row: 
+@r: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@row: 
 
 
 <!-- ##### FUNCTION atk_table_get_column_header ##### -->
@@ -180,8 +171,9 @@ AtkTable
 </para>
 
 @table: 
-@column: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@column: 
 
 
 <!-- ##### FUNCTION atk_table_get_row_header ##### -->
@@ -190,8 +182,9 @@ AtkTable
 </para>
 
 @table: 
-@row: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@row: 
 
 
 <!-- ##### FUNCTION atk_table_get_summary ##### -->
@@ -209,6 +202,8 @@ AtkTable
 </para>
 
 @table: 
+@accessible: 
+<!-- # Unused Parameters # -->
 @caption: 
 
 
@@ -219,6 +214,8 @@ AtkTable
 
 @table: 
 @row: 
+@accessible: 
+<!-- # Unused Parameters # -->
 @description: 
 
 
@@ -229,6 +226,8 @@ AtkTable
 
 @table: 
 @column: 
+@accessible: 
+<!-- # Unused Parameters # -->
 @description: 
 
 
@@ -267,8 +266,9 @@ AtkTable
 </para>
 
 @table: 
-@selected: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@selected: 
 
 
 <!-- ##### FUNCTION atk_table_get_selected_rows ##### -->
@@ -277,8 +277,9 @@ AtkTable
 </para>
 
 @table: 
-@selected: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@selected: 
 
 
 <!-- ##### FUNCTION atk_table_is_column_selected ##### -->
@@ -312,43 +313,3 @@ AtkTable
 @Returns: 
 
 
-<!-- ##### FUNCTION atk_table_add_column_selection ##### -->
-<para>
-
-</para>
-
-@table: 
-@column: 
-@Returns: 
-
-
-<!-- ##### FUNCTION atk_table_add_row_selection ##### -->
-<para>
-
-</para>
-
-@table: 
-@row: 
-@Returns: 
-
-
-<!-- ##### FUNCTION atk_table_remove_column_selection ##### -->
-<para>
-
-</para>
-
-@table: 
-@column: 
-@Returns: 
-
-
-<!-- ##### FUNCTION atk_table_remove_row_selection ##### -->
-<para>
-
-</para>
-
-@table: 
-@row: 
-@Returns: 
-
-
diff --git a/docs/tmpl/atktext.sgml b/docs/tmpl/atktext.sgml
index 1922edb..3e15ef4 100644
--- a/docs/tmpl/atktext.sgml
+++ b/docs/tmpl/atktext.sgml
@@ -32,8 +32,7 @@ AtkText
 @get_character_at_offset: 
 @get_text_before_offset: 
 @get_caret_offset: 
-@get_run_attributes: 
-@get_default_attributes: 
+@get_range_attributes: 
 @get_character_extents: 
 @get_character_count: 
 @get_offset_at_point: 
@@ -45,7 +44,6 @@ AtkText
 @set_caret_offset: 
 @text_changed: 
 @caret_changed: 
-@text_selection_changed: 
 
 <!-- ##### ENUM AtkTextBoundary ##### -->
 <para>
@@ -53,6 +51,7 @@ AtkText
 </para>
 
 @ATK_TEXT_BOUNDARY_CHAR: 
+@ATK_TEXT_BOUNDARY_CURSOR_POS: 
 @ATK_TEXT_BOUNDARY_WORD_START: 
 @ATK_TEXT_BOUNDARY_WORD_END: 
 @ATK_TEXT_BOUNDARY_SENTENCE_START: 
@@ -60,53 +59,6 @@ AtkText
 @ATK_TEXT_BOUNDARY_LINE_START: 
 @ATK_TEXT_BOUNDARY_LINE_END: 
 
-<!-- ##### STRUCT AtkAttribute ##### -->
-<para>
-
-</para>
-
-@name: 
-@value: 
-
-<!-- ##### TYPEDEF AtkAttributeSet ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ENUM AtkTextAttribute ##### -->
-<para>
-
-</para>
-
-@ATK_TEXT_ATTR_LEFT_MARGIN: 
-@ATK_TEXT_ATTR_RIGHT_MARGIN: 
-@ATK_TEXT_ATTR_INDENT: 
-@ATK_TEXT_ATTR_INVISIBLE: 
-@ATK_TEXT_ATTR_EDITABLE: 
-@ATK_TEXT_ATTR_PIXELS_ABOVE_LINES: 
-@ATK_TEXT_ATTR_PIXELS_BELOW_LINES: 
-@ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP: 
-@ATK_TEXT_ATTR_BG_FULL_HEIGHT: 
-@ATK_TEXT_ATTR_RISE: 
-@ATK_TEXT_ATTR_UNDERLINE: 
-@ATK_TEXT_ATTR_STRIKETHROUGH: 
-@ATK_TEXT_ATTR_SIZE: 
-@ATK_TEXT_ATTR_SCALE: 
-@ATK_TEXT_ATTR_WEIGHT: 
-@ATK_TEXT_ATTR_LANGUAGE: 
-@ATK_TEXT_ATTR_FAMILY_NAME: 
-@ATK_TEXT_ATTR_BG_COLOR: 
-@ATK_TEXT_ATTR_FG_COLOR: 
-@ATK_TEXT_ATTR_BG_STIPPLE: 
-@ATK_TEXT_ATTR_FG_STIPPLE: 
-@ATK_TEXT_ATTR_WRAP_MODE: 
-@ATK_TEXT_ATTR_DIRECTION: 
-@ATK_TEXT_ATTR_JUSTIFICATION: 
-@ATK_TEXT_ATTR_STRETCH: 
-@ATK_TEXT_ATTR_VARIANT: 
-@ATK_TEXT_ATTR_STYLE: 
-
 <!-- ##### FUNCTION atk_text_get_text ##### -->
 <para>
 
@@ -136,9 +88,10 @@ AtkText
 @text: 
 @offset: 
 @boundary_type: 
+@Returns: 
+<!-- # Unused Parameters # -->
 @start_offset: 
 @end_offset: 
-@Returns: 
 
 
 <!-- ##### FUNCTION atk_text_get_text_at_offset ##### -->
@@ -149,9 +102,10 @@ AtkText
 @text: 
 @offset: 
 @boundary_type: 
+@Returns: 
+<!-- # Unused Parameters # -->
 @start_offset: 
 @end_offset: 
-@Returns: 
 
 
 <!-- ##### FUNCTION atk_text_get_text_before_offset ##### -->
@@ -162,9 +116,10 @@ AtkText
 @text: 
 @offset: 
 @boundary_type: 
+@Returns: 
+<!-- # Unused Parameters # -->
 @start_offset: 
 @end_offset: 
-@Returns: 
 
 
 <!-- ##### FUNCTION atk_text_get_caret_offset ##### -->
@@ -185,32 +140,13 @@ AtkText
 @offset: 
 @x: 
 @y: 
+@length: 
 @width: 
+<!-- # Unused Parameters # -->
 @height: 
 @coords: 
 
 
-<!-- ##### FUNCTION atk_text_get_run_attributes ##### -->
-<para>
-
-</para>
-
-@text: 
-@offset: 
-@start_offset: 
-@end_offset: 
-@Returns: 
-
-
-<!-- ##### FUNCTION atk_text_get_default_attributes ##### -->
-<para>
-
-</para>
-
-@text: 
-@Returns: 
-
-
 <!-- ##### FUNCTION atk_text_get_character_count ##### -->
 <para>
 
@@ -228,8 +164,9 @@ AtkText
 @text: 
 @x: 
 @y: 
-@coords: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@coords: 
 
 
 <!-- ##### FUNCTION atk_text_get_n_selections ##### -->
@@ -296,30 +233,3 @@ AtkText
 @Returns: 
 
 
-<!-- ##### FUNCTION atk_attribute_set_free ##### -->
-<para>
-
-</para>
-
-@attrib_set: 
-
-
-<!-- ##### FUNCTION atk_attribute_get_name ##### -->
-<para>
-
-</para>
-
-@attr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION atk_attribute_get_value ##### -->
-<para>
-
-</para>
-
-@attr: 
-@index: 
-@Returns: 
-
-
diff --git a/docs/tmpl/atkutil.sgml b/docs/tmpl/atkutil.sgml
index fd370eb..b96ede3 100644
--- a/docs/tmpl/atkutil.sgml
+++ b/docs/tmpl/atkutil.sgml
@@ -14,20 +14,8 @@ AtkUtil
 
 </para>
 
-<!-- ##### STRUCT AtkUtil ##### -->
-<para>
-
-</para>
-
-@parent: 
-
-<!-- ##### ENUM AtkCoordType ##### -->
-<para>
-
-</para>
-
-@ATK_XY_SCREEN: 
-@ATK_XY_WINDOW: 
+<<<<<<< atkutil.sgml
+=======
 
 <!-- ##### FUNCTION atk_add_focus_tracker ##### -->
 <para>
@@ -62,110 +50,7 @@ AtkUtil
 @object: 
 
 
-<!-- ##### USER_FUNCTION AtkEventListener ##### -->
-<para>
-
-</para>
-
-@Param1: 
-
-
-<!-- ##### USER_FUNCTION AtkEventListenerInit ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION atk_add_global_event_listener ##### -->
-<para>
-
-</para>
-
-@listener: 
-@event_type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION atk_remove_global_event_listener ##### -->
-<para>
-
-</para>
-
-@listener_id: 
-
-
-<!-- ##### STRUCT AtkKeyEventStruct ##### -->
-<para>
-
-</para>
-
-@type: 
-@state: 
-@keyval: 
-@length: 
-@string: 
-@keycode: 
-@timestamp: 
-
-<!-- ##### ENUM AtkKeyEventType ##### -->
-<para>
-
-</para>
-
-@ATK_KEY_EVENT_PRESS: 
-@ATK_KEY_EVENT_RELEASE: 
-@ATK_KEY_EVENT_LAST_DEFINED: 
-
-<!-- ##### USER_FUNCTION AtkKeySnoopFunc ##### -->
-<para>
-
-</para>
-
-@event: 
-@func_data: 
-@Returns: 
-
-
-<!-- ##### FUNCTION atk_add_key_event_listener ##### -->
-<para>
-
-</para>
-
-@listener: 
-@data: 
-@Returns: 
-
-
-<!-- ##### FUNCTION atk_remove_key_event_listener ##### -->
-<para>
-
-</para>
-
-@listener_id: 
-
-
-<!-- ##### FUNCTION atk_get_root ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION atk_get_toolkit_name ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION atk_get_toolkit_version ##### -->
-<para>
-
-</para>
-
-@Returns: 
+<<<<<<< atkutil.sgml
+=======