diff --git a/ChangeLog b/ChangeLog
index 3cb89eae7a..ef8230858e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 11 01:05:00 2001  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtktypeutils.h: grum, gtk_type_class() is not GNUC_CONST
+	it has the _important_ side effect of initializing a class.
+
 2001-05-10  Alexander Larsson  <alexl@redhat.com>
 
 	* gdk/linux-fb/gdkprivate-fb.h:
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3cb89eae7a..ef8230858e 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Fri May 11 01:05:00 2001  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtktypeutils.h: grum, gtk_type_class() is not GNUC_CONST
+	it has the _important_ side effect of initializing a class.
+
 2001-05-10  Alexander Larsson  <alexl@redhat.com>
 
 	* gdk/linux-fb/gdkprivate-fb.h:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3cb89eae7a..ef8230858e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri May 11 01:05:00 2001  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtktypeutils.h: grum, gtk_type_class() is not GNUC_CONST
+	it has the _important_ side effect of initializing a class.
+
 2001-05-10  Alexander Larsson  <alexl@redhat.com>
 
 	* gdk/linux-fb/gdkprivate-fb.h:
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3cb89eae7a..ef8230858e 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Fri May 11 01:05:00 2001  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtktypeutils.h: grum, gtk_type_class() is not GNUC_CONST
+	it has the _important_ side effect of initializing a class.
+
 2001-05-10  Alexander Larsson  <alexl@redhat.com>
 
 	* gdk/linux-fb/gdkprivate-fb.h:
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3cb89eae7a..ef8230858e 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri May 11 01:05:00 2001  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtktypeutils.h: grum, gtk_type_class() is not GNUC_CONST
+	it has the _important_ side effect of initializing a class.
+
 2001-05-10  Alexander Larsson  <alexl@redhat.com>
 
 	* gdk/linux-fb/gdkprivate-fb.h:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3cb89eae7a..ef8230858e 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri May 11 01:05:00 2001  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtktypeutils.h: grum, gtk_type_class() is not GNUC_CONST
+	it has the _important_ side effect of initializing a class.
+
 2001-05-10  Alexander Larsson  <alexl@redhat.com>
 
 	* gdk/linux-fb/gdkprivate-fb.h:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3cb89eae7a..ef8230858e 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri May 11 01:05:00 2001  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtktypeutils.h: grum, gtk_type_class() is not GNUC_CONST
+	it has the _important_ side effect of initializing a class.
+
 2001-05-10  Alexander Larsson  <alexl@redhat.com>
 
 	* gdk/linux-fb/gdkprivate-fb.h:
diff --git a/docs/reference/gdk-pixbuf/tmpl/animation.sgml b/docs/reference/gdk-pixbuf/tmpl/animation.sgml
index f13b066aca..a6d372c557 100644
--- a/docs/reference/gdk-pixbuf/tmpl/animation.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/animation.sgml
@@ -20,6 +20,31 @@ Animated images.
     #GdkPixbufLoader
   </para>
 
+<!-- ##### ENUM GdkPixbufFrameAction ##### -->
+<para>
+
+</para>
+
+@GDK_PIXBUF_FRAME_RETAIN: 
+@GDK_PIXBUF_FRAME_DISPOSE: 
+@GDK_PIXBUF_FRAME_REVERT: 
+
+<!-- ##### STRUCT GdkPixbufFrame ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@x_offset: 
+@y_offset: 
+@delay_time: 
+@elapsed: 
+@action: 
+@need_recomposite: 
+@bg_transparent: 
+@composited: 
+@revert: 
+
 <!-- ##### STRUCT GdkPixbufAnimation ##### -->
   <para>
     This object describes an animation.
diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index 20397f167d..4cb131d8ce 100644
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -1621,3 +1621,19 @@ fundamental type.
 @window: 
 @Returns: 
 
+<!-- ##### FUNCTION gtk_window_set_decorations_hint ##### -->
+<para>
+
+</para>
+
+@window: 
+@decorations: 
+
+<!-- ##### FUNCTION gtk_window_set_functions_hint ##### -->
+<para>
+
+</para>
+
+@window: 
+@functions: 
+
diff --git a/docs/reference/gtk/tmpl/gtksignal.sgml b/docs/reference/gtk/tmpl/gtksignal.sgml
index 52c116c266..1a5a4f3e27 100644
--- a/docs/reference/gtk/tmpl/gtksignal.sgml
+++ b/docs/reference/gtk/tmpl/gtksignal.sgml
@@ -289,7 +289,7 @@ you don't want a return value.
 the callbacks.
 
 
-<!-- ##### MACRO gtk_signal_lookup ##### -->
+<!-- ##### FUNCTION gtk_signal_lookup ##### -->
 <para>
 Given the name of the signal and the type of object it connects
 to, get the signal's identifying integer.  Emitting the signal
@@ -304,7 +304,7 @@ It also tries the ancestors of the given type.
 @Returns: the signal's identifying number, or 0 if no signal was found.
 
 
-<!-- ##### MACRO gtk_signal_name ##### -->
+<!-- ##### FUNCTION gtk_signal_name ##### -->
 <para>
 Given the signal's identifier, find its name.
 </para>
@@ -381,7 +381,7 @@ an array of GtkArgs instead of using C's varargs mechanism.
 followed by one which is a pointer to the return type.
 
 
-<!-- ##### MACRO gtk_signal_emit_stop ##### -->
+<!-- ##### FUNCTION gtk_signal_emit_stop ##### -->
 <para>
 This function aborts a signal's current emission.
 </para>
@@ -415,7 +415,7 @@ except it will lookup the signal id for you.
 @name: the name of the signal you wish to stop.
 
 
-<!-- ##### MACRO gtk_signal_connect ##### -->
+<!-- ##### FUNCTION gtk_signal_connect ##### -->
 <para>
 Attach a function pointer and user data to a signal for
 a particular object.
@@ -467,7 +467,7 @@ is getting pressed, this is that button.
 @d: 
 
 
-<!-- ##### MACRO gtk_signal_connect_after ##### -->
+<!-- ##### FUNCTION gtk_signal_connect_after ##### -->
 <para>
 Attach a function pointer and user data to a signal
 so that this handler will be called after the other handlers.
@@ -485,7 +485,7 @@ so that this handler will be called after the other handlers.
 @d: 
 
 
-<!-- ##### MACRO gtk_signal_connect_object ##### -->
+<!-- ##### FUNCTION gtk_signal_connect_object ##### -->
 <para>
 This function is for registering a callback that will
 call another object's callback.  That is,
@@ -520,7 +520,7 @@ really pass any gpointer as the #slot_object .)
 @d: 
 
 
-<!-- ##### MACRO gtk_signal_connect_object_after ##### -->
+<!-- ##### FUNCTION gtk_signal_connect_object_after ##### -->
 <para>
 Attach a signal hook to a signal, passing in an alternate
 object as the first parameter, and guaranteeing 
@@ -626,7 +626,7 @@ should signal the removal of this signal.
 @name: name of the signal.
 
 
-<!-- ##### MACRO gtk_signal_disconnect ##### -->
+<!-- ##### FUNCTION gtk_signal_disconnect ##### -->
 <para>
 Destroy a user-defined handler connection.
 </para>
@@ -635,7 +635,7 @@ Destroy a user-defined handler connection.
 @handler_id: the connection id.
 
 
-<!-- ##### MACRO gtk_signal_disconnect_by_func ##### -->
+<!-- ##### FUNCTION gtk_signal_disconnect_by_func ##### -->
 <para>
 Destroy all connections for a particular object, with
 the given function-pointer and user-data.
@@ -650,7 +650,7 @@ the given function-pointer and user-data.
 @d: 
 
 
-<!-- ##### MACRO gtk_signal_disconnect_by_data ##### -->
+<!-- ##### FUNCTION gtk_signal_disconnect_by_data ##### -->
 <para>
 Destroy all connections for a particular object, with
 the given user-data.
@@ -663,7 +663,7 @@ the given user-data.
 @d: 
 
 
-<!-- ##### MACRO gtk_signal_handler_block ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_block ##### -->
 <para>
 Prevent an user-defined handler from being invoked.  All other
 signal processing will go on as normal, but this particular
@@ -674,7 +674,7 @@ handler will ignore it.
 @handler_id: the connection id.
 
 
-<!-- ##### MACRO gtk_signal_handler_block_by_func ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_block_by_func ##### -->
 <para>
 Prevent a user-defined handler from being invoked, by reference to
 the user-defined handler's function pointer and user data.  (It may result in
@@ -690,7 +690,7 @@ multiple hooks being blocked, if you've called connect multiple times.)
 @d: 
 
 
-<!-- ##### MACRO gtk_signal_handler_block_by_data ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_block_by_data ##### -->
 <para>
 Prevent all user-defined handlers with a certain user data from being invoked.
 </para>
@@ -702,7 +702,7 @@ Prevent all user-defined handlers with a certain user data from being invoked.
 @d: 
 
 
-<!-- ##### MACRO gtk_signal_handler_unblock ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_unblock ##### -->
 <para>
 Undo a block, by connection id.  Note that undoing a block doesn't
 necessarily make the hook callable, because if you block a
@@ -714,7 +714,7 @@ hook twice, you must unblock it twice.
 gtk_signal_connect(), etc.
 
 
-<!-- ##### MACRO gtk_signal_handler_unblock_by_func ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_unblock_by_func ##### -->
 <para>
 Undo a block, by function pointer and data.
 Note that undoing a block doesn't
@@ -731,7 +731,7 @@ hook twice, you must unblock it twice.
 @d: 
 
 
-<!-- ##### MACRO gtk_signal_handler_unblock_by_data ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_unblock_by_data ##### -->
 <para>
 Undo block(s), to all signals for a particular object
 with a particular user-data pointer
@@ -744,7 +744,7 @@ with a particular user-data pointer
 @d: 
 
 
-<!-- ##### MACRO gtk_signal_handler_pending ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_pending ##### -->
 <para>
 Returns a connection id corresponding to a given signal id and object.
 </para>
@@ -766,7 +766,7 @@ handler.
 @b: 
 
 
-<!-- ##### MACRO gtk_signal_handler_pending_by_func ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_pending_by_func ##### -->
 <para>
 Returns a connection id corresponding to a given signal id, object, function
 pointer and user data.
diff --git a/docs/reference/gtk/tmpl/gtktypeutils.sgml b/docs/reference/gtk/tmpl/gtktypeutils.sgml
index e6a3ad7abf..6295e2dfa1 100644
--- a/docs/reference/gtk/tmpl/gtktypeutils.sgml
+++ b/docs/reference/gtk/tmpl/gtktypeutils.sgml
@@ -560,7 +560,7 @@ Create a new, unique type.
 @type_info: must not be null, and @type_info->type_name must also not be null.
 
 
-<!-- ##### MACRO gtk_type_name ##### -->
+<!-- ##### FUNCTION gtk_type_name ##### -->
 <para>
 </para>
 
@@ -568,7 +568,7 @@ Create a new, unique type.
 @Returns: a pointer to the name of a type, or NULL if it has none.
 
 
-<!-- ##### MACRO gtk_type_from_name ##### -->
+<!-- ##### FUNCTION gtk_type_from_name ##### -->
 <para>
 Get the internal representation of a type given its name.
 </para>
@@ -577,7 +577,7 @@ Get the internal representation of a type given its name.
 @Returns: a GtkType
 
 
-<!-- ##### MACRO gtk_type_parent ##### -->
+<!-- ##### FUNCTION gtk_type_parent ##### -->
 <para>
 
 </para>
@@ -608,7 +608,7 @@ has all the proper initializers called.
 @Returns: gpointer to a GtkTypeObject
 
 
-<!-- ##### MACRO gtk_type_is_a ##### -->
+<!-- ##### FUNCTION gtk_type_is_a ##### -->
 <para>
 Look in the type hierarchy to see if @type has @is_a_type among its
 ancestors.  Do so with a simple lookup, not a loop.
diff --git a/docs/reference/gtk/tmpl/gtkwindow.sgml b/docs/reference/gtk/tmpl/gtkwindow.sgml
index adab57e9f5..6f4ab3766a 100644
--- a/docs/reference/gtk/tmpl/gtkwindow.sgml
+++ b/docs/reference/gtk/tmpl/gtkwindow.sgml
@@ -393,15 +393,6 @@ it's larger
 @setting: 
 
 
-<!-- ##### FUNCTION gtk_window_set_decorations_hint ##### -->
-<para>
-
-</para>
-
-@window: 
-@decorations: 
-
-
 <!-- ##### FUNCTION gtk_window_set_frame_dimensions ##### -->
 <para>
 
@@ -414,15 +405,6 @@ it's larger
 @bottom: 
 
 
-<!-- ##### FUNCTION gtk_window_set_functions_hint ##### -->
-<para>
-
-</para>
-
-@window: 
-@functions: 
-
-
 <!-- ##### FUNCTION gtk_window_set_has_frame ##### -->
 <para>
 
diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index d88f7dd069..3f13ab9d46 100644
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -219,7 +219,7 @@ struct _GtkTypeInfo
 };
 GtkType		gtk_type_unique	(GtkType	   parent_type,
 				 const GtkTypeInfo *gtkinfo);
-gpointer	gtk_type_class	(GtkType	 type) G_GNUC_CONST;
+gpointer	gtk_type_class	(GtkType	 type);
 gpointer	gtk_type_new	(GtkType	 type);