diff --git a/ChangeLog b/ChangeLog
index c0bd7a0319..8c9968d8d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-06  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/gdkcolor.c: 
+	* gdk/gdkfont.c: Add some Deprecation info. 
+
 Wed Dec  4 19:41:14 2002  Eric Warmenhoven <eric@warmenhoven.org>
 
 	* gdk/linux-fb/gdkglobals-fb.c gdk/linux-fb/gdkkeyboard-fb.c
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c0bd7a0319..8c9968d8d5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-12-06  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/gdkcolor.c: 
+	* gdk/gdkfont.c: Add some Deprecation info. 
+
 Wed Dec  4 19:41:14 2002  Eric Warmenhoven <eric@warmenhoven.org>
 
 	* gdk/linux-fb/gdkglobals-fb.c gdk/linux-fb/gdkkeyboard-fb.c
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c0bd7a0319..8c9968d8d5 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-12-06  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/gdkcolor.c: 
+	* gdk/gdkfont.c: Add some Deprecation info. 
+
 Wed Dec  4 19:41:14 2002  Eric Warmenhoven <eric@warmenhoven.org>
 
 	* gdk/linux-fb/gdkglobals-fb.c gdk/linux-fb/gdkkeyboard-fb.c
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c0bd7a0319..8c9968d8d5 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-12-06  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/gdkcolor.c: 
+	* gdk/gdkfont.c: Add some Deprecation info. 
+
 Wed Dec  4 19:41:14 2002  Eric Warmenhoven <eric@warmenhoven.org>
 
 	* gdk/linux-fb/gdkglobals-fb.c gdk/linux-fb/gdkkeyboard-fb.c
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c0bd7a0319..8c9968d8d5 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-12-06  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/gdkcolor.c: 
+	* gdk/gdkfont.c: Add some Deprecation info. 
+
 Wed Dec  4 19:41:14 2002  Eric Warmenhoven <eric@warmenhoven.org>
 
 	* gdk/linux-fb/gdkglobals-fb.c gdk/linux-fb/gdkkeyboard-fb.c
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c0bd7a0319..8c9968d8d5 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-12-06  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/gdkcolor.c: 
+	* gdk/gdkfont.c: Add some Deprecation info. 
+
 Wed Dec  4 19:41:14 2002  Eric Warmenhoven <eric@warmenhoven.org>
 
 	* gdk/linux-fb/gdkglobals-fb.c gdk/linux-fb/gdkkeyboard-fb.c
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index e9fe134d26..41de9d743b 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,5 +1,16 @@
 2002-12-06  Matthias Clasen  <maclas@gmx.de>
 
+	* gdk/tmpl/x_interaction.sgml: 
+	* gdk/tmpl/gdkscreen.sgml: 
+	* gdk/tmpl/gdkdisplaymanager.sgml: 
+	* gdk/tmpl/gdkdisplay.sgml: 
+	* gtk/tmpl/gtkstock.sgml: 
+	* gtk/tmpl/gtkwidget.sgml: 
+	* gtk/tmpl/gtkmain.sgml: 
+	* gtk/tmpl/gtkcolorsel.sgml: 
+	* gtk/tmpl/gtkaccelgroup.sgml: 
+	* gdk-pixbuf/tmpl/module_interface.sgml: Add "Since" information.
+
 	* gtk/gtk-sections.txt: Replace gtk_list_store_move by
 	_move_before and _move_after.
 
diff --git a/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml b/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml
index 26f0c72ea2..c1404c6f4a 100644
--- a/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml
@@ -143,6 +143,7 @@ module. Only modules should access the fields directly.
 @extensions: a %NULL-terminated array of typical filename extensions for the
 image format.
 @flags: 
+@Since: 2.2
 
 <!-- ##### ENUM GdkPixbufFormatFlags ##### -->
 <para>
@@ -150,6 +151,7 @@ image format.
 </para>
 
 @GDK_PIXBUF_FORMAT_WRITABLE: 
+@Since: 2.2
 
 <!-- ##### STRUCT GdkPixbufModulePattern ##### -->
 <para>
@@ -170,6 +172,8 @@ The signature of a module is stored as an array of
 @mask: mask containing bytes which modify how the prefix is matched against
   test data
 @relevance: relevance of this pattern
+@Since: 2.2
+
 
 <!-- ##### USER_FUNCTION GdkPixbufModuleFillVtableFunc ##### -->
 <para>
@@ -178,6 +182,8 @@ Defines the type of the function used to set the vtable of a
 </para>
 
 @module: a #GdkPixbufModule.
+@Since: 2.2
+
 
 
 <!-- ##### USER_FUNCTION GdkPixbufModuleFillInfoFunc ##### -->
@@ -187,6 +193,8 @@ Defines the type of the function used to fill a
 </para>
 
 @info: a #GdkPixbufFormat.
+@Since: 2.2
+
 
 
 <!-- ##### USER_FUNCTION GdkPixbufModuleSizeFunc ##### -->
@@ -205,6 +213,8 @@ then perform the required scaling on the completely loaded image.
 @width: pointer to a location containing the current image width
 @height: pointer to a location containing the current image height
 @user_data: the loader.
+@Since: 2.2
+
 
 
 <!-- ##### USER_FUNCTION GdkPixbufModulePreparedFunc ##### -->
@@ -221,6 +231,8 @@ signal.
 @pixbuf: the #GdkPixbuf that is currently being loaded.
 @anim: if an animation is being loaded, the #GdkPixbufAnimation, else %NULL.
 @user_data: the loader.
+@Since: 2.2
+
 
 
 <!-- ##### USER_FUNCTION GdkPixbufModuleUpdatedFunc ##### -->
@@ -240,6 +252,8 @@ signal.
 @width: the width of the updated area.
 @height: the height of the updated area.
 @user_data: the loader.
+@Since: 2.2
+
 
 
 <!-- ##### STRUCT GdkPixbufModule ##### -->
diff --git a/docs/reference/gdk/tmpl/gdkdisplay.sgml b/docs/reference/gdk/tmpl/gdkdisplay.sgml
index fce33c2e7b..714ac1af24 100644
--- a/docs/reference/gdk/tmpl/gdkdisplay.sgml
+++ b/docs/reference/gdk/tmpl/gdkdisplay.sgml
@@ -34,6 +34,7 @@ The <structname>GdkDisplay</structname> struct is the GDK representation
 of an X display. All its fields are private and should not be accessed directly. 
 </para>
 
+@Since: 2.2
 
 <!-- ##### FUNCTION gdk_display_open ##### -->
 <para>
@@ -240,6 +241,7 @@ Applications should never have any reason to use this facility
   returning the location of that window in @win_x, @win_y. Returns %NULL 
   if the window under the mouse pointer is not known to GDK (for example, 
   belongs to another application).
+@Since: 2.2
 
 <!-- ##### FUNCTION gdk_display_set_pointer_hooks ##### -->
 <para>
diff --git a/docs/reference/gdk/tmpl/gdkdisplaymanager.sgml b/docs/reference/gdk/tmpl/gdkdisplaymanager.sgml
index 771f09eeaf..f408ad7389 100644
--- a/docs/reference/gdk/tmpl/gdkdisplaymanager.sgml
+++ b/docs/reference/gdk/tmpl/gdkdisplaymanager.sgml
@@ -22,6 +22,7 @@ The <structname>GdkDisplayManager</structname> struct has no interesting
 fields.
 </para>
 
+@Since: 2.2
 
 <!-- ##### FUNCTION gdk_display_manager_get ##### -->
 <para>
diff --git a/docs/reference/gdk/tmpl/gdkscreen.sgml b/docs/reference/gdk/tmpl/gdkscreen.sgml
index 5b15f781b0..2947dc2cea 100644
--- a/docs/reference/gdk/tmpl/gdkscreen.sgml
+++ b/docs/reference/gdk/tmpl/gdkscreen.sgml
@@ -29,6 +29,7 @@ the @window_at_pointer function in #GdkPointerHooks. It will be used
 when GDK gets multihead support. 
 </para>
 
+@Since: 2.2
 
 <!-- ##### FUNCTION gdk_screen_get_default ##### -->
 <para>
diff --git a/docs/reference/gdk/tmpl/x_interaction.sgml b/docs/reference/gdk/tmpl/x_interaction.sgml
index d44d1ba2ac..867eab1046 100644
--- a/docs/reference/gdk/tmpl/x_interaction.sgml
+++ b/docs/reference/gdk/tmpl/x_interaction.sgml
@@ -375,8 +375,9 @@ Obtains the #GdkFont for the given Xlib font ID on @display, or %NULL if no
 #GdkFont has been created for @xid.
 </para>
 
-@display: 
-@xid: 
+@display: a #GdkDisplay
+@xid: an Xlib font ID
+Since: 2.2
 
 
 <!-- ##### FUNCTION gdk_x11_lookup_xdisplay ##### -->
diff --git a/docs/reference/gtk/tmpl/gtkaccelgroup.sgml b/docs/reference/gtk/tmpl/gtkaccelgroup.sgml
index 6a503af878..4c928e05ad 100644
--- a/docs/reference/gtk/tmpl/gtkaccelgroup.sgml
+++ b/docs/reference/gtk/tmpl/gtkaccelgroup.sgml
@@ -106,6 +106,7 @@ Deprecated equivalent of g_object_unref().
 @closure: 
 @data: 
 @Returns: 
+@Since: 2.2
 
 
 <!-- ##### FUNCTION gtk_accel_group_disconnect ##### -->
diff --git a/docs/reference/gtk/tmpl/gtkcolorsel.sgml b/docs/reference/gtk/tmpl/gtkcolorsel.sgml
index 80eec4bb14..9d02693079 100644
--- a/docs/reference/gtk/tmpl/gtkcolorsel.sgml
+++ b/docs/reference/gtk/tmpl/gtkcolorsel.sgml
@@ -237,6 +237,7 @@ time.
 @screen: 
 @colors: 
 @n_colors: 
+@Since: 2.2
 
 
 <!-- ##### FUNCTION gtk_color_selection_set_color ##### -->
diff --git a/docs/reference/gtk/tmpl/gtkliststore.sgml b/docs/reference/gtk/tmpl/gtkliststore.sgml
index bce8d449cf..fbe5b3596a 100644
--- a/docs/reference/gtk/tmpl/gtkliststore.sgml
+++ b/docs/reference/gtk/tmpl/gtkliststore.sgml
@@ -271,3 +271,23 @@ particular row is needed often, it is worth keeping the iter around.
 @b: 
 
 
+<!-- ##### FUNCTION gtk_list_store_move_before ##### -->
+<para>
+
+</para>
+
+@store: 
+@iter: 
+@position: 
+
+
+<!-- ##### FUNCTION gtk_list_store_move_after ##### -->
+<para>
+
+</para>
+
+@store: 
+@iter: 
+@position: 
+
+
diff --git a/docs/reference/gtk/tmpl/gtkmain.sgml b/docs/reference/gtk/tmpl/gtkmain.sgml
index b36bdbcb47..e04b57c7cc 100644
--- a/docs/reference/gtk/tmpl/gtkmain.sgml
+++ b/docs/reference/gtk/tmpl/gtkmain.sgml
@@ -286,6 +286,7 @@ cleaned from any arguments that GTK+ handles itself.
 </para>
 
 @display: 
+@Since: 2.2
 
 
 <!-- ##### FUNCTION gtk_true ##### -->
diff --git a/docs/reference/gtk/tmpl/gtkstock.sgml b/docs/reference/gtk/tmpl/gtkstock.sgml
index 64a1108bd3..0410980cbc 100644
--- a/docs/reference/gtk/tmpl/gtkstock.sgml
+++ b/docs/reference/gtk/tmpl/gtkstock.sgml
@@ -153,9 +153,11 @@ The "Close" item.
 
 <!-- ##### MACRO GTK_STOCK_COLOR_PICKER ##### -->
 <para>
-
+The "Color Picker" item.
+<inlinegraphic fileref="stock_colorselector_24.png" format="PNG"></inlinegraphic>
 </para>
 
+@Since: 2.2
 
 
 <!-- ##### MACRO GTK_STOCK_CONVERT ##### -->
diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml
index 646f5dc379..d730693c4a 100644
--- a/docs/reference/gtk/tmpl/gtkwidget.sgml
+++ b/docs/reference/gtk/tmpl/gtkwidget.sgml
@@ -36,6 +36,9 @@ handles the emission.
 Implementation of this signal is optional.
 </para>
 
+@parent_class: 
+@activate_signal: 
+@set_scroll_adjustments_signal: 
 
 <!-- ##### ENUM GtkWidgetFlags ##### -->
 <para>
diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c
index 8b9778d8a4..5e0d73b4e2 100644
--- a/gdk/gdkcolor.c
+++ b/gdk/gdkcolor.c
@@ -251,9 +251,10 @@ gdk_colormap_alloc_color (GdkColormap *colormap,
  *    <structfield>pixel</structfield> field will be filled in.
  * 
  * Allocates a single color from a colormap.
- * This function is obsolete. See gdk_colormap_alloc_color().
  * 
  * Return value: %TRUE if the allocation succeeded.
+ *
+ * Deprecated: Use gdk_colormap_alloc_color() instead.
  **/
 gboolean
 gdk_color_alloc (GdkColormap *colormap,
diff --git a/gdk/gdkfont.c b/gdk/gdkfont.c
index 02dd2f214b..2d4d04ced6 100644
--- a/gdk/gdkfont.c
+++ b/gdk/gdkfont.c
@@ -113,6 +113,8 @@ gdk_string_width (GdkFont     *font,
  * Determines the width of a given character.
  * 
  * Return value: the width of the character in pixels.
+ *
+ * Deprecated: Use gdk_text_extents() instead.
  **/
 gint
 gdk_char_width (GdkFont *font,
@@ -302,7 +304,9 @@ gdk_text_height (GdkFont     *font,
  * determine how this total height will be drawn in
  * relation to the baseline. See gdk_text_extents().
  * 
- * Return value: the height of the character in pixels. 
+ * Return value: the height of the character in pixels.
+ *
+ * Deprecated: Use gdk_text_extents() instead.
  **/
 gint
 gdk_char_height (GdkFont *font,