diff --git a/ChangeLog b/ChangeLog
index 343c71dafe..21476132a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-09-30  Murray Cumming  <murrayc@usa.net>
+ 
+ 	* gtk/gtkcellrenderer.h: The render vfunc takes a GdkDrawable*
+ 	instead of a GdkWindow*, because that what it is given. The 
+ 	documentation was already correct. This should cause no API/ABI
+ 	breakage with C compilers.
+ 	* gtk/gtkcellrenderertext.c, gtkcellrendererpixbuf.c, 
+ 	gtkcellrenderertogger.c: Updated the declarations of the render vfunc
+ 	implementation accordingly.
+
 2003-09-30  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/gdkkeys.c (gdk_keymap_class_init): Document the
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 343c71dafe..21476132a7 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2003-09-30  Murray Cumming  <murrayc@usa.net>
+ 
+ 	* gtk/gtkcellrenderer.h: The render vfunc takes a GdkDrawable*
+ 	instead of a GdkWindow*, because that what it is given. The 
+ 	documentation was already correct. This should cause no API/ABI
+ 	breakage with C compilers.
+ 	* gtk/gtkcellrenderertext.c, gtkcellrendererpixbuf.c, 
+ 	gtkcellrenderertogger.c: Updated the declarations of the render vfunc
+ 	implementation accordingly.
+
 2003-09-30  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/gdkkeys.c (gdk_keymap_class_init): Document the
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 343c71dafe..21476132a7 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+2003-09-30  Murray Cumming  <murrayc@usa.net>
+ 
+ 	* gtk/gtkcellrenderer.h: The render vfunc takes a GdkDrawable*
+ 	instead of a GdkWindow*, because that what it is given. The 
+ 	documentation was already correct. This should cause no API/ABI
+ 	breakage with C compilers.
+ 	* gtk/gtkcellrenderertext.c, gtkcellrendererpixbuf.c, 
+ 	gtkcellrenderertogger.c: Updated the declarations of the render vfunc
+ 	implementation accordingly.
+
 2003-09-30  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/gdkkeys.c (gdk_keymap_class_init): Document the
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 343c71dafe..21476132a7 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+2003-09-30  Murray Cumming  <murrayc@usa.net>
+ 
+ 	* gtk/gtkcellrenderer.h: The render vfunc takes a GdkDrawable*
+ 	instead of a GdkWindow*, because that what it is given. The 
+ 	documentation was already correct. This should cause no API/ABI
+ 	breakage with C compilers.
+ 	* gtk/gtkcellrenderertext.c, gtkcellrendererpixbuf.c, 
+ 	gtkcellrenderertogger.c: Updated the declarations of the render vfunc
+ 	implementation accordingly.
+
 2003-09-30  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/gdkkeys.c (gdk_keymap_class_init): Document the
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 343c71dafe..21476132a7 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+2003-09-30  Murray Cumming  <murrayc@usa.net>
+ 
+ 	* gtk/gtkcellrenderer.h: The render vfunc takes a GdkDrawable*
+ 	instead of a GdkWindow*, because that what it is given. The 
+ 	documentation was already correct. This should cause no API/ABI
+ 	breakage with C compilers.
+ 	* gtk/gtkcellrenderertext.c, gtkcellrendererpixbuf.c, 
+ 	gtkcellrenderertogger.c: Updated the declarations of the render vfunc
+ 	implementation accordingly.
+
 2003-09-30  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk/gdkkeys.c (gdk_keymap_class_init): Document the
diff --git a/docs/reference/gdk/tmpl/windows.sgml b/docs/reference/gdk/tmpl/windows.sgml
index 190688bc9f..bb7ec04ff5 100644
--- a/docs/reference/gdk/tmpl/windows.sgml
+++ b/docs/reference/gdk/tmpl/windows.sgml
@@ -416,6 +416,24 @@ Deprecated equivalent of g_object_unref()
 @window: 
 
 
+<!-- ##### FUNCTION gdk_window_set_keep_above ##### -->
+<para>
+
+</para>
+
+@window: 
+@setting: 
+
+
+<!-- ##### FUNCTION gdk_window_set_keep_below ##### -->
+<para>
+
+</para>
+
+@window: 
+@setting: 
+
+
 <!-- ##### FUNCTION gdk_window_move ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index 75dd092425..74bda7b2b8 100644
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -1411,6 +1411,13 @@ produce superscript and subscript.
 @user_data: 
 @Returns: 
 
+<!-- ##### SIGNAL GtkUIManager::changed ##### -->
+<para>
+
+</para>
+
+@uimanager: the object which received the signal.
+
 <!-- ##### ARG GtkVScale:adjustment ##### -->
 <para>
 the #GtkAdjustment which sets the range of the scale.
diff --git a/docs/reference/gtk/tmpl/gtkaction.sgml b/docs/reference/gtk/tmpl/gtkaction.sgml
index e01a7c773d..f7aa548624 100644
--- a/docs/reference/gtk/tmpl/gtkaction.sgml
+++ b/docs/reference/gtk/tmpl/gtkaction.sgml
@@ -127,6 +127,22 @@ and should not be accessed directly.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_action_connect_accelerator ##### -->
+<para>
+
+</para>
+
+@action: 
+
+
+<!-- ##### FUNCTION gtk_action_disconnect_accelerator ##### -->
+<para>
+
+</para>
+
+@action: 
+
+
 <!-- ##### FUNCTION gtk_action_block_activate_from ##### -->
 <para>
 
@@ -154,6 +170,15 @@ and should not be accessed directly.
 @accel_path: 
 
 
+<!-- ##### FUNCTION gtk_action_set_accel_group ##### -->
+<para>
+
+</para>
+
+@action: 
+@accel_group: 
+
+
 <!-- ##### SIGNAL GtkAction::activate ##### -->
 <para>
 
@@ -161,6 +186,22 @@ and should not be accessed directly.
 
 @action: the object which received the signal.
 
+<!-- ##### SIGNAL GtkAction::connect-proxy ##### -->
+<para>
+
+</para>
+
+@action: the object which received the signal.
+@widget: 
+
+<!-- ##### SIGNAL GtkAction::disconnect-proxy ##### -->
+<para>
+
+</para>
+
+@action: the object which received the signal.
+@widget: 
+
 <!-- ##### ARG GtkAction:is-important ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml b/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml
index 7fa5ba7478..b846ca8051 100644
--- a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml
+++ b/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml
@@ -147,6 +147,11 @@ field of the #GtkCheckMenuItem-struct struct to discover the new state.
 
 </para>
 
+<!-- ##### ARG GtkCheckMenuItem:draw-as-radio ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkCheckMenuItem:inconsistent ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkeventbox.sgml b/docs/reference/gtk/tmpl/gtkeventbox.sgml
index 8dc8fbcd93..75cb9b035f 100644
--- a/docs/reference/gtk/tmpl/gtkeventbox.sgml
+++ b/docs/reference/gtk/tmpl/gtkeventbox.sgml
@@ -31,3 +31,13 @@ Creates a new #GtkEventBox.
 @Returns: a new #GtkEventBox.
 
 
+<!-- ##### ARG GtkEventBox:above-child ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkEventBox:visible-window ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkmenu.sgml b/docs/reference/gtk/tmpl/gtkmenu.sgml
index d59a519fa3..21e3a575ee 100644
--- a/docs/reference/gtk/tmpl/gtkmenu.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenu.sgml
@@ -340,6 +340,26 @@ will be called when the menu is later detached from the widget.
 
 </para>
 
+<!-- ##### ARG GtkMenu:bottom-attach ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMenu:left-attach ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMenu:right-attach ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMenu:top-attach ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkMenu:horizontal-offset ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtktextview.sgml b/docs/reference/gtk/tmpl/gtktextview.sgml
index a7e83a93f2..2bd3e136e1 100644
--- a/docs/reference/gtk/tmpl/gtktextview.sgml
+++ b/docs/reference/gtk/tmpl/gtktextview.sgml
@@ -727,6 +727,11 @@ in an idle job in the background.
 
 @textview: the object which received the signal.
 
+<!-- ##### ARG GtkTextView:accepts-tab ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkTextView:buffer ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtktoggleaction.sgml b/docs/reference/gtk/tmpl/gtktoggleaction.sgml
index d3ccd4db9e..e2f62c0982 100644
--- a/docs/reference/gtk/tmpl/gtktoggleaction.sgml
+++ b/docs/reference/gtk/tmpl/gtktoggleaction.sgml
@@ -48,6 +48,24 @@ private members and should not be accessed directly.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_toggle_action_set_draw_as_radio ##### -->
+<para>
+
+</para>
+
+@action: 
+@draw_as_radio: 
+
+
+<!-- ##### FUNCTION gtk_toggle_action_get_draw_as_radio ##### -->
+<para>
+
+</para>
+
+@action: 
+@Returns: 
+
+
 <!-- ##### SIGNAL GtkToggleAction::toggled ##### -->
 <para>
 
@@ -55,3 +73,8 @@ private members and should not be accessed directly.
 
 @toggleaction: the object which received the signal.
 
+<!-- ##### ARG GtkToggleAction:draw-as-radio ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkuimanager.sgml b/docs/reference/gtk/tmpl/gtkuimanager.sgml
index 69aaec51ad..6195004350 100644
--- a/docs/reference/gtk/tmpl/gtkuimanager.sgml
+++ b/docs/reference/gtk/tmpl/gtkuimanager.sgml
@@ -339,6 +339,13 @@ what UI element to create.
 @self: 
 
 
+<!-- ##### SIGNAL GtkUIManager::actions-changed ##### -->
+<para>
+
+</para>
+
+@uimanager: the object which received the signal.
+
 <!-- ##### SIGNAL GtkUIManager::add-widget ##### -->
 <para>
 
@@ -347,15 +354,13 @@ what UI element to create.
 @uimanager: the object which received the signal.
 @widget: 
 
-<!-- ##### SIGNAL GtkUIManager::changed ##### -->
-<para>
-
-</para>
-
-@uimanager: the object which received the signal.
-
 <!-- ##### ARG GtkUIManager:add-tearoffs ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG GtkUIManager:ui ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml
index 3b9b286d92..293a4466d7 100644
--- a/docs/reference/gtk/tmpl/gtkwidget.sgml
+++ b/docs/reference/gtk/tmpl/gtkwidget.sgml
@@ -39,6 +39,7 @@ gtk_widget_style_get_valist() to obtain the value of a style property.
 @allocation: The widgets allocated size.
 @window: The widgets window or its parent window if it does not have a window. (Which 
  will be indicated by the #GTK_NO_WINDOW flag being set).
+@parent: 
 
 <!-- ##### STRUCT GtkWidgetClass ##### -->
 <para>
@@ -128,6 +129,7 @@ Tells about certain properties of the widget.
 @GTK_DOUBLE_BUFFERED: 
         Set and unset by gtk_widget_set_double_buffered().
         Indicates that exposes done on the widget should be double-buffered.
+@GTK_NO_SHOW_ALL: 
 
 <!-- ##### MACRO GTK_WIDGET_TYPE ##### -->
 <para>
@@ -1610,6 +1612,24 @@ This function is deprecated; it does nothing.
 @widget: 
 
 
+<!-- ##### FUNCTION gtk_widget_set_no_show_all ##### -->
+<para>
+
+</para>
+
+@widget: 
+@no_show_all: 
+
+
+<!-- ##### FUNCTION gtk_widget_get_no_show_all ##### -->
+<para>
+
+</para>
+
+@widget: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_requisition_copy ##### -->
 <para>
 
@@ -2222,6 +2242,11 @@ a widget changes from un-anchored to anchored or vice-versa.
 
 </para>
 
+<!-- ##### ARG GtkWidget:no-show-all ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkWidget:parent ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkwindow.sgml b/docs/reference/gtk/tmpl/gtkwindow.sgml
index b6638c1585..7d1dde0e2b 100644
--- a/docs/reference/gtk/tmpl/gtkwindow.sgml
+++ b/docs/reference/gtk/tmpl/gtkwindow.sgml
@@ -420,6 +420,24 @@ Deprecated alias for gtk_window_set_position().
 @window: 
 
 
+<!-- ##### FUNCTION gtk_window_set_keep_above ##### -->
+<para>
+
+</para>
+
+@window: 
+@setting: 
+
+
+<!-- ##### FUNCTION gtk_window_set_keep_below ##### -->
+<para>
+
+</para>
+
+@window: 
+@setting: 
+
+
 <!-- ##### FUNCTION gtk_window_begin_resize_drag ##### -->
 <para>
 
diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h
index 7b693e7c7f..0dd241b9ff 100644
--- a/gtk/gtkcellrenderer.h
+++ b/gtk/gtkcellrenderer.h
@@ -86,7 +86,7 @@ struct _GtkCellRendererClass
 				      gint                 *width,
 				      gint                 *height);
   void             (* render)        (GtkCellRenderer      *cell,
-				      GdkWindow            *window,
+				      GdkDrawable          *window,
 				      GtkWidget            *widget,
 				      GdkRectangle         *background_area,
 				      GdkRectangle         *cell_area,
diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c
index fc50718780..64fa881354 100644
--- a/gtk/gtkcellrendererpixbuf.c
+++ b/gtk/gtkcellrendererpixbuf.c
@@ -42,7 +42,7 @@ static void gtk_cell_renderer_pixbuf_get_size   (GtkCellRenderer            *cel
 						 gint                       *width,
 						 gint                       *height);
 static void gtk_cell_renderer_pixbuf_render     (GtkCellRenderer            *cell,
-						 GdkWindow                  *window,
+						 GdkDrawable                *window,
 						 GtkWidget                  *widget,
 						 GdkRectangle               *background_area,
 						 GdkRectangle               *cell_area,
diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index 210cbc4831..52ab1f4edb 100644
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -1253,7 +1253,7 @@ gtk_cell_renderer_text_get_size (GtkCellRenderer *cell,
 
 static void
 gtk_cell_renderer_text_render (GtkCellRenderer      *cell,
-			       GdkWindow            *window,
+			       GdkDrawable          *window,
 			       GtkWidget            *widget,
 			       GdkRectangle         *background_area,
 			       GdkRectangle         *cell_area,
diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c
index f5b6061e89..030f610f21 100644
--- a/gtk/gtkcellrenderertoggle.c
+++ b/gtk/gtkcellrenderertoggle.c
@@ -308,7 +308,7 @@ gtk_cell_renderer_toggle_get_size (GtkCellRenderer *cell,
 
 static void
 gtk_cell_renderer_toggle_render (GtkCellRenderer      *cell,
-				 GdkWindow            *window,
+				 GdkDrawable          *window,
 				 GtkWidget            *widget,
 				 GdkRectangle         *background_area,
 				 GdkRectangle         *cell_area,