diff --git a/devel-docs/ChangeLog b/devel-docs/ChangeLog
index 3aa750ee5d..b8b867411d 100644
--- a/devel-docs/ChangeLog
+++ b/devel-docs/ChangeLog
@@ -1,3 +1,10 @@
+2003-11-06  Michael Natterer  <mitch@gimp.org>
+
+	* libgimp/libgimp-sections.txt
+	* libgimp/tmpl/gimpexport.sgml
+	* libgimpwidgets/libgimpwidgets-sections.txt
+	* libgimpwidgets/tmpl/gimpdialog.sgml: updated.
+
 2003-11-05  Sven Neumann  <sven@gimp.org>
 
 	* app/app-docs.sgml
diff --git a/devel-docs/libgimp/libgimp-sections.txt b/devel-docs/libgimp/libgimp-sections.txt
index c134231e2e..78517d394a 100644
--- a/devel-docs/libgimp/libgimp-sections.txt
+++ b/devel-docs/libgimp/libgimp-sections.txt
@@ -88,7 +88,7 @@ gimp_ui_init
 <SECTION>
 <FILE>gimpexport</FILE>
 GimpExportCapabilities
-GimpExportReturnType
+GimpExportReturn
 gimp_export_image
 </SECTION>
 
diff --git a/devel-docs/libgimp/tmpl/gimpexport.sgml b/devel-docs/libgimp/tmpl/gimpexport.sgml
index 18c5c644de..5a9dcc1ce4 100644
--- a/devel-docs/libgimp/tmpl/gimpexport.sgml
+++ b/devel-docs/libgimp/tmpl/gimpexport.sgml
@@ -38,7 +38,7 @@ as it will most probably have to open a dialog.
 @GIMP_EXPORT_CAN_HANDLE_LAYERS_AS_ANIMATION: 
 @GIMP_EXPORT_NEEDS_ALPHA: 
 
-<!-- ##### ENUM GimpExportReturnType ##### -->
+<!-- ##### ENUM GimpExportReturn ##### -->
 <para>
 
 </para>
diff --git a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt
index e8fb53bb06..f99b31cb2e 100644
--- a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt
+++ b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt
@@ -224,9 +224,8 @@ GIMP_OFFSET_AREA_GET_CLASS
 <TITLE>GimpDialog</TITLE>
 GimpDialog
 gimp_dialog_new
-gimp_dialog_newv
-gimp_dialog_create_action_area
-gimp_dialog_create_action_areav
+gimp_dialog_new_valist
+gimp_dialog_add_buttons_valist
 <SUBSECTION Standard>
 GIMP_TYPE_DIALOG
 GIMP_DIALOG
diff --git a/devel-docs/libgimpwidgets/tmpl/gimpdialog.sgml b/devel-docs/libgimpwidgets/tmpl/gimpdialog.sgml
index 9bcc916380..e7d0e152de 100644
--- a/devel-docs/libgimpwidgets/tmpl/gimpdialog.sgml
+++ b/devel-docs/libgimpwidgets/tmpl/gimpdialog.sgml
@@ -27,107 +27,42 @@ dialog-related stuff.
 </para>
 
 @title: 
-@wmclass_name: 
+@role: 
+@parent: 
+@flags: 
 @help_func: 
 @help_id: 
+@Varargs: 
+@Returns: 
+<!-- # Unused Parameters # -->
+@wmclass_name: 
 @position: 
 @allow_shrink: 
 @allow_grow: 
 @auto_shrink: 
-@Varargs: 
-@Returns: 
-<!-- # Unused Parameters # -->
 @help_data: 
 
 
-<!-- ##### FUNCTION gimp_dialog_newv ##### -->
+<!-- ##### FUNCTION gimp_dialog_new_valist ##### -->
 <para>
 
 </para>
 
 @title: 
-@wmclass_name: 
+@role: 
+@parent: 
+@flags: 
 @help_func: 
 @help_id: 
-@position: 
-@allow_shrink: 
-@allow_grow: 
-@auto_shrink: 
 @args: 
 @Returns: 
-<!-- # Unused Parameters # -->
-@help_data: 
 
 
-<!-- ##### FUNCTION gimp_dialog_create_action_area ##### -->
+<!-- ##### FUNCTION gimp_dialog_add_buttons_valist ##### -->
 <para>
 
 </para>
 
-@dialog: 
-@Varargs: 
-
-
-<!-- ##### FUNCTION gimp_dialog_create_action_areav ##### -->
-<para>
-
-The @va_list describing the action_area #GtkButton's has the following format:
-
-<informaltable pgwide="1" frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="4*"/><colspec colwidth="8*"/>
-<tbody>
-
-<row>
-<entry>#gchar *label,</entry>
-<entry>The button's label.</entry>
-</row>
-
-<row>
-<entry>#GtkSignalFunc callback,</entry>
-<entry>The callback which will be connected to the button's
-"clicked" signal</entry>
-</row>
-
-<row>
-<entry>#gpointer data,</entry>
-<entry>The callback data which will be used in
-gtk_signal_connect(). If you pass #NULL, then the dialog itself will
-by passed as @data.</entry>
-</row>
-
-<row>
-<entry>#GtkObject *slot_object,</entry>
-<entry>If you pass a pointer other than #NULL, then the button's "clicked"
-signal will be connected with gtk_signal_connect_object() instead of
-gtk_signal_connect(). If you want the dialog itself to be the
-@slot_object, pass "1".</entry>
-</row>
-
-<row>
-<entry>#GtkWidget **widget_ptr,</entry>
-<entry>A pointer to store the created button in.</entry>
-</row>
-
-<row>
-<entry>#gboolean default_action,</entry>
-<entry>#TRUE if this button should grab the default dialog action with
-gtk_widget_grab_default().</entry>
-</row>
-
-<row>
-<entry>#gboolean connect_delete,</entry>
-<entry>#TRUE if the dialog's "delete_event" should be connected to
-this button's callback. Usually you will connect to the dialog's
-"Cancel" callback. Note that the callback will be called indirectly,
-so you don't have to worry about the #GdkEvent pointer which comes
-with the "delete_event", as it will be stripped away before your
-"Cancel" callback is called.</entry>
-</row>
-
-</tbody></tgroup></informaltable>
-
-</para>
-
 @dialog: 
 @args: