Document 2.2 API additions.

25 files changed, 304 insertions, 103 deletions

diff --git a/gdk/gdk.c b/gdk/gdk.c
index c3caeb8bf6..87d12ea469 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -279,6 +279,8 @@ _gdk_get_command_line_args (int    *argc,
  *
  * You shouldn't call this function explicitely if you are using
  * gtk_init(), gtk_init_check(), gdk_init(), or gdk_init_check().
+ *
+ * Since: 2.2
  **/
 void
 gdk_parse_args (int    *argc,
@@ -357,6 +359,8 @@ gdk_parse_args (int    *argc,
  *
  * Returns: the display name, if specified explicitely, otherwise %NULL
  *   this string is owned by GTK+ and must not be modified or freed.
+ *
+ * Since: 2.2
  */
 G_CONST_RETURN gchar *
 gdk_get_display_arg_name (void)
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index e121e426dd..820caf7030 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -175,6 +175,8 @@ gdk_display_finalize (GObject *object)
  *
  * Closes the connection windowing system for the given display,
  * and cleans up associated resources.
+ *
+ * Since: 2.2
  */
 void
 gdk_display_close (GdkDisplay *display)
@@ -201,6 +203,8 @@ gdk_display_close (GdkDisplay *display)
  * 
  * Return value: the next #GdkEvent to be processed, or %NULL if no events
  * are pending. The returned #GdkEvent should be freed with gdk_event_free().
+ *
+ * Since: 2.2
  **/
 GdkEvent*
 gdk_display_get_event (GdkDisplay *display)
@@ -220,9 +224,11 @@ gdk_display_get_event (GdkDisplay *display)
  * not get more events from the windowing system.  It only checks the events
  * that have already been moved to the GDK event queue.)
  * 
- * Return value: a copy of the first #GdkEvent on the event queue, or %NULL if no
- * events are in the queue. The returned #GdkEvent should be freed with
+ * Return value: a copy of the first #GdkEvent on the event queue, or %NULL 
+ * if no events are in the queue. The returned #GdkEvent should be freed with
  * gdk_event_free().
+ *
+ * Since: 2.2
  **/
 GdkEvent*
 gdk_display_peek_event (GdkDisplay *display)
@@ -246,6 +252,8 @@ gdk_display_peek_event (GdkDisplay *display)
  *
  * Appends a copy of the given event onto the front of the event
  * queue for @display.
+ *
+ * Since: 2.2
  **/
 void
 gdk_display_put_event (GdkDisplay *display,
@@ -259,8 +267,8 @@ gdk_display_put_event (GdkDisplay *display,
 
 /**
  * gdk_pointer_ungrab:
- * @time_: a timestamp from a #GdkEvent, or %GDK_CURRENT_TIME if no timestamp is
- *        available.
+ * @time_: a timestamp from a #GdkEvent, or %GDK_CURRENT_TIME if no 
+ *  timestamp is available.
  *
  * Ungrabs the pointer, if it is grabbed by this application.
  **/
@@ -374,6 +382,8 @@ gdk_device_get_core_pointer (void)
  * 
  * Return value: the core pointer device; this is owned by the
  *   display and should not be freed.
+ *
+ * Since: 2.2
  **/
 GdkDevice *
 gdk_display_get_core_pointer (GdkDisplay *display)
@@ -435,6 +445,8 @@ _gdk_get_sm_client_id (void)
  * 
  * Gets the current location of the pointer and the current modifier
  * mask for a given display.
+ *
+ * Since: 2.2
  **/
 void
 gdk_display_get_pointer (GdkDisplay      *display,
@@ -473,6 +485,8 @@ gdk_display_get_pointer (GdkDisplay      *display,
  * another application).
  * 
  * Returns: the window under the mouse pointer, or %NULL
+ *
+ * Since: 2.2
  **/
 GdkWindow *
 gdk_display_get_window_at_pointer (GdkDisplay *display,
@@ -505,6 +519,8 @@ gdk_display_get_window_at_pointer (GdkDisplay *display,
  * reason to use this facility.
  *
  * Return value: the previous pointer hook table
+ *
+ * Since: 2.2
  **/
 GdkDisplayPointerHooks *
 gdk_display_set_pointer_hooks (GdkDisplay                   *display,
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index 644652dc30..5ca5ae23b3 100644
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -160,6 +160,8 @@ gdk_display_manager_get_property (GObject      *object,
  *
  * Returns the global #GdkDisplayManager singleton; gdk_parse_pargs(),
  * gdk_init(), or gdk_init_check() must have been called first.
+ *
+ * Since: 2.2
  **/
 GdkDisplayManager*
 gdk_display_manager_get (void)
@@ -180,6 +182,8 @@ gdk_display_manager_get (void)
  * 
  * Returns: a #GdkDisplay, or %NULL if there is no default
  *   display.
+ *
+ * Since: 2.2
  */
 GdkDisplay *
 gdk_display_manager_get_default_display (GdkDisplayManager *display_manager)
@@ -198,6 +202,8 @@ gdk_display_manager_get_default_display (GdkDisplayManager *display_manager)
  * 
  * Returns: a #GdkDisplay, or %NULL if there is no default
  *   display.
+ *
+ * Since: 2.2
  */
 GdkDisplay *
 gdk_display_get_default (void)
@@ -212,6 +218,8 @@ gdk_display_get_default (void)
  * gdk_display_get_default ()).
  * 
  * Returns: a #GdkScreen, or %NULL if there is no default display.
+ *
+ * Since: 2.2
  */
 GdkScreen *
 gdk_screen_get_default (void)
@@ -228,6 +236,8 @@ gdk_screen_get_default (void)
  * @display: a #GdkDisplay
  * 
  * Sets @display as the default display.
+ *
+ * Since: 2.2
  **/
 void
 gdk_display_manager_set_default_display (GdkDisplayManager *display_manager,
@@ -248,6 +258,8 @@ gdk_display_manager_set_default_display (GdkDisplayManager *display_manager,
  * 
  * Return value: a newly allocated #GSList of #GdkDisplay objects.
  *  Free this list with g_slist_free() when you are done with it.
+ *
+ * Since: 2.2
  **/
 GSList *
 gdk_display_manager_list_displays (GdkDisplayManager *display_manager)
diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c
index dfffb04212..b9062caadd 100644
--- a/gdk/gdkdraw.c
+++ b/gdk/gdkdraw.c
@@ -211,6 +211,8 @@ gdk_drawable_get_depth (GdkDrawable *drawable)
  * Gets the #GdkScreen associated with a #GdkDrawable.
  * 
  * Return value: the #GdkScreen associated with @drawable
+ *
+ * Since: 2.2
  **/
 GdkScreen*
 gdk_drawable_get_screen(GdkDrawable *drawable)
@@ -227,6 +229,8 @@ gdk_drawable_get_screen(GdkDrawable *drawable)
  * Gets the #GdkDisplay associated with a #GdkDrawable.
  * 
  * Return value: the #GdkDisplay associated with @drawable
+ *
+ * Since: 2.2
  **/
 GdkDisplay*
 gdk_drawable_get_display (GdkDrawable *drawable)
@@ -723,17 +727,20 @@ gdk_draw_image (GdkDrawable *drawable,
  * @dest_y: Destination Y coordinate within drawable.
  * @width: Width of region to render, in pixels, or -1 to use pixbuf width.
  * @height: Height of region to render, in pixels, or -1 to use pixbuf height.
- * @dither: Dithering mode for GdkRGB.
+ * @dither: Dithering mode for #GdkRGB.
  * @x_dither: X offset for dither.
  * @y_dither: Y offset for dither.
  * 
  * Renders a rectangular portion of a pixbuf to a drawable.  The destination
  * drawable must have a colormap. All windows have a colormap, however, pixmaps
- * only have colormap by default if they were created with a non-NULL window argument.
- * Otherwise a colormap must be set on them with gdk_drawable_set_colormap.
+ * only have colormap by default if they were created with a non-%NULL window 
+ * argument. Otherwise a colormap must be set on them with 
+ * gdk_drawable_set_colormap().
+ *
+ * On older X servers, rendering pixbufs with an alpha channel involves round 
+ * trips to the X server, and may be somewhat slow.
  *
- * On older X servers, rendering pixbufs with an alpha channel involves round trips
- * to the X server, and may be somewhat slow.
+ * Since: 2.2
  **/
 void
 gdk_draw_pixbuf (GdkDrawable     *drawable,
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 4e464906e3..48d938f41c 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -268,6 +268,8 @@ static GHashTable *event_hash = NULL;
  * 
  * Return value: a newly-allocated #GdkEvent. The returned #GdkEvent 
  * should be freed with gdk_event_free().
+ *
+ * Since: 2.2
  **/
 GdkEvent*
 gdk_event_new (GdkEventType type)
@@ -828,6 +830,8 @@ gdk_event_get_axis (GdkEvent   *event,
  * Sets the screen for @event to @screen. The event must
  * have been allocated by GTK+, for instance, by
  * gdk_event_copy().
+ *
+ * Since: 2.2
  **/
 void
 gdk_event_set_screen (GdkEvent  *event,
@@ -847,14 +851,16 @@ gdk_event_set_screen (GdkEvent  *event,
  * @event: a #GdkEvent
  * 
  * Returns the screen for the event. The screen is
- * typically the screen for event->any.window, but
+ * typically the screen for <literal>event->any.window</literal>, but
  * for events such as mouse events, it is the screen
  * where the the pointer was when the event occurs -
  * that is, the screen which has the root window 
- * to which event->motion.x_root and
- * event->motion.y_root are relative.
+ * to which <literal>event->motion.x_root</literal> and
+ * <literal>event->motion.y_root</literal> are relative.
  * 
  * Return value: the screen for the event
+ *
+ * Since: 2.2
  **/
 GdkScreen *
 gdk_event_get_screen (GdkEvent *event)
@@ -1105,6 +1111,8 @@ gdk_synthesize_window_state (GdkWindow     *window,
  * Sets the double click time (two clicks within this time interval
  * count as a double click and result in a #GDK_2BUTTON_PRESS event).
  * Applications should NOT set this, it is a global user-configured setting.
+ *
+ * Since: 2.2
  **/
 void
 gdk_display_set_double_click_time (GdkDisplay *display,
diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c
index 20f1eef31f..825abd07d8 100644
--- a/gdk/gdkrgb.c
+++ b/gdk/gdkrgb.c
@@ -3488,7 +3488,7 @@ gdk_rgb_get_colormap (void)
 
 /**
  * gdk_screen_get_rgb_colormap:
- * @screen : a #GdkScreen.
+ * @screen: a #GdkScreen.
  * 
  * Gets the preferred colormap for rendering image data on @screen.
  * Not a very useful function; historically, GDK could only render RGB
@@ -3497,6 +3497,8 @@ gdk_rgb_get_colormap (void)
  * call this function.
  * 
  * Return value: the preferred colormap
+ *
+ * Since: 2.2
  **/
 GdkColormap *
 gdk_screen_get_rgb_colormap (GdkScreen *screen)
@@ -3516,7 +3518,7 @@ gdk_screen_get_rgb_colormap (GdkScreen *screen)
 
 /**
  * gdk_screen_get_rgb_visual:
- * @screen : a #GdkScreen
+ * @screen: a #GdkScreen
  * 
  * Gets a "preferred visual" chosen by GdkRGB for rendering image data
  * on @screen. In previous versions of
@@ -3526,6 +3528,8 @@ gdk_screen_get_rgb_colormap (GdkScreen *screen)
  * drawables with any visual.
  * 
  * Return value: The #GdkVisual chosen by GdkRGB.
+ *
+ * Since: 2.2
  **/
 GdkVisual *
 gdk_screen_get_rgb_visual (GdkScreen *screen)
diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c
index 564328ff75..f7160ecbc1 100644
--- a/gdk/gdkscreen.c
+++ b/gdk/gdkscreen.c
@@ -92,14 +92,16 @@ _gdk_screen_close (GdkScreen *screen)
 
 /**
  * gdk_screen_get_monitor_at_point:
- * @screen : a #GdkScreen.
- * @x : the x coordinate in the virtual screen.
- * @y : the y coordinate in the virtual screen.
+ * @screen: a #GdkScreen.
+ * @x: the x coordinate in the virtual screen.
+ * @y: the y coordinate in the virtual screen.
  *
  * Returns the monitor number in which the point (@x,@y) is located.
  *
  * Returns: the monitor number in which the point (@x,@y) belong, or
  *   -1 if the point is not in any monitor.
+ *
+ * Since: 2.2
  **/
 gint 
 gdk_screen_get_monitor_at_point (GdkScreen *screen,
@@ -134,8 +136,10 @@ gdk_screen_get_monitor_at_point (GdkScreen *screen,
  * @window: a #GdkWindow
  * @returns: the monitor number in which most of @window is located.
  *
- * Returns the number of the monitor in which the largest area of the bounding rectangle
- * of @window resides. 
+ * Returns the number of the monitor in which the largest area of the 
+ * bounding rectangle of @window resides. 
+ *
+ * Since: 2.2
  **/
 gint 
 gdk_screen_get_monitor_at_window (GdkScreen      *screen,
@@ -171,7 +175,7 @@ gdk_screen_get_monitor_at_window (GdkScreen      *screen,
  * 
  * Returns the width of the default screen in pixels.
  * 
- * Return value:  the width of the default screen in pixels.
+ * Return value: the width of the default screen in pixels.
  **/
 gint
 gdk_screen_width (void)
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index e8d564ed66..4687626121 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -694,7 +694,7 @@ gdk_window_remove_filter (GdkWindow     *window,
 
 /**
  * gdk_screen_get_toplevel_windows:
- * @screen : The #GdkScreen where the toplevels are located.
+ * @screen: The #GdkScreen where the toplevels are located.
  * 
  * Obtains a list of all toplevel windows known to GDK on the screen @screen.
  * A toplevel window is a child of the root window (see
@@ -704,6 +704,8 @@ gdk_window_remove_filter (GdkWindow     *window,
  * its elements need not be freed.
  * 
  * Return value: list of toplevel windows, free with g_list_free()
+ *
+ * Since: 2.2
  **/
 GList *
 gdk_screen_get_toplevel_windows (GdkScreen *screen)
diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c
index 4157099304..c4e6a4b0ce 100644
--- a/gdk/x11/gdkcolor-x11.c
+++ b/gdk/x11/gdkcolor-x11.c
@@ -376,6 +376,8 @@ gdk_colormap_sync (GdkColormap *colormap,
  * Gets the system's default colormap for @screen
  *
  * Returns: the default colormap for @screen.
+ *
+ * Since: 2.2
  */
 GdkColormap *
 gdk_screen_get_system_colormap (GdkScreen *screen)
@@ -1263,6 +1265,8 @@ gdk_color_change (GdkColormap *colormap,
  *   with gdk_x11_colormap_foreign_new(), unref'ing the last
  *   reference to the object will only free the #GdkColoramp
  *   object and not call XFreeColormap()
+ *
+ * Since: 2.2
  **/
 GdkColormap *
 gdk_x11_colormap_foreign_new (GdkVisual *visual,
@@ -1499,6 +1503,8 @@ gdk_x11_colormap_get_xcolormap (GdkColormap *colormap)
  * Gets the screen for which this colormap was created.
  * 
  * Return value: the screen for which this colormap was created.
+ *
+ * Since: 2.2
  **/
 GdkScreen *
 gdk_colormap_get_screen (GdkColormap *cmap)
diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index 6498745184..a891df347f 100644
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -98,6 +98,8 @@
  * a cursor with no pixels in it.
  * 
  * Return value: a new #GdkCursor
+ *
+ * Since: 2.2
  **/
 GdkCursor*
 gdk_cursor_new_for_display (GdkDisplay    *display,
@@ -276,11 +278,13 @@ gdk_x11_cursor_get_xcursor (GdkCursor *cursor)
 
 /** 
  * gdk_cursor_get_display:
- * @cursor : a #GdkCursor.
+ * @cursor: a #GdkCursor.
+ *
+ * Returns the display on which the #GdkCursor is defined.
  *
- * Returns the display on which the GdkCursor is defined
+ * Returns: the #GdkDisplay associated to @cursor
  *
- * Returns : the #GdkDisplay associated to @cursor
+ * Since: 2.2
  */
 
 GdkDisplay *
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index aa8ee560cb..7c4a328a4e 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -99,6 +99,8 @@ gdk_display_x11_class_init (GdkDisplayX11Class * class)
  *  could not be opened.
  *
  * Opens a display.
+ *
+ * Since: 2.2
  */
 GdkDisplay *
 gdk_display_open (const gchar *display_name)
@@ -302,6 +304,8 @@ gdk_internal_connection_watch (Display  *display,
  * 
  * Returns: a string representing the display name. This string is owned
  * by GDK and should not be modified or freed.
+ * 
+ * Since: 2.2
  */
 G_CONST_RETURN gchar *
 gdk_display_get_name (GdkDisplay * display)
@@ -318,6 +322,8 @@ gdk_display_get_name (GdkDisplay * display)
  * Gets the number of screen managed by the @display.
  * 
  * Returns: number of screens.
+ * 
+ * Since: 2.2
  */
 gint
 gdk_display_get_n_screens (GdkDisplay * display)
@@ -333,8 +339,10 @@ gdk_display_get_n_screens (GdkDisplay * display)
  * @screen_num: the screen number
  *
  * Returns a screen object for one of the screens of the display.
- * 
+ *
  * Returns: the #GdkScreen object
+ *
+ * Since: 2.2
  */
 GdkScreen *
 gdk_display_get_screen (GdkDisplay * display, gint screen_num)
@@ -352,6 +360,8 @@ gdk_display_get_screen (GdkDisplay * display, gint screen_num)
  * Get the default #GdkScreen for @display.
  * 
  * Returns: the default #GdkScreen object for @display
+ *
+ * Since: 2.2
  */
 GdkScreen *
 gdk_display_get_default_screen (GdkDisplay * display)
@@ -382,10 +392,12 @@ _gdk_x11_display_is_root_window (GdkDisplay *display,
 
 /**
  * gdk_display_pointer_ungrab:
- * @display : a #GdkDisplay.
+ * @display: a #GdkDisplay.
  * @time_: a timestap (e.g. GDK_CURRENT_TIME).
  *
  * Release any pointer grab.
+ *
+ * Since: 2.2
  */
 void
 gdk_display_pointer_ungrab (GdkDisplay *display,
@@ -399,12 +411,14 @@ gdk_display_pointer_ungrab (GdkDisplay *display,
 }
 
 /**
- * gdk_display_pointer_is_grabbed :
- * @display : a #GdkDisplay
+ * gdk_display_pointer_is_grabbed:
+ * @display: a #GdkDisplay
  *
  * Test if the pointer is grabbed.
  *
- * Returns : TRUE if an active X pointer grab is in effect
+ * Returns: %TRUE if an active X pointer grab is in effect
+ *
+ * Since: 2.2
  */
 gboolean
 gdk_display_pointer_is_grabbed (GdkDisplay * display)
@@ -416,10 +430,12 @@ gdk_display_pointer_is_grabbed (GdkDisplay * display)
 
 /**
  * gdk_display_keyboard_ungrab:
- * @display : a #GdkDisplay.
- * @time_ : a timestap (e.g #GDK_CURRENT_TIME).
+ * @display: a #GdkDisplay.
+ * @time_: a timestap (e.g #GDK_CURRENT_TIME).
  *
  * Release any keyboard grab
+ *
+ * Since: 2.2
  */
 void
 gdk_display_keyboard_ungrab (GdkDisplay *display,
@@ -437,6 +453,7 @@ gdk_display_keyboard_ungrab (GdkDisplay *display,
  *
  * Emits a short beep on @display
  *
+ * Since: 2.2
  */
 void
 gdk_display_beep (GdkDisplay * display)
@@ -447,17 +464,20 @@ gdk_display_beep (GdkDisplay * display)
 }
 
 /**
- * gdk_display_sync :
- * @display : a #GdkDisplay
+ * gdk_display_sync:
+ * @display: a #GdkDisplay
  *
  * Flushes any requests queued for the windowing system and waits until all
  * requests have been handled. This is often used for making sure that the
  * display is synchronized with the current state of the program. Calling
  * gdk_display_sync() before gdk_error_trap_pop() makes sure that any errors
- * generated from earlier requests are handled before the error trap is removed.
+ * generated from earlier requests are handled before the error trap is 
+ * removed.
  *
  * This is most useful for X11. On windowing systems where requests are
  * handled synchronously, this function will do nothing.
+ *
+ * Since: 2.2
  */
 void
 gdk_display_sync (GdkDisplay * display)
@@ -475,6 +495,8 @@ gdk_display_sync (GdkDisplay * display)
  * To ungrab the display again, use gdk_x11_display_ungrab(). 
  *
  * gdk_x11_display_grab()/gdk_x11_display_ungrab() calls can be nested.
+ *
+ * Since: 2.2
  **/
 void
 gdk_x11_display_grab (GdkDisplay * display)
@@ -496,6 +518,8 @@ gdk_x11_display_grab (GdkDisplay * display)
  * 
  * Ungrab @display after it has been grabbed with 
  * gdk_x11_display_grab(). 
+ *
+ * Since: 2.2
  **/
 void
 gdk_x11_display_ungrab (GdkDisplay * display)
@@ -582,6 +606,8 @@ gdk_display_x11_finalize (GObject *object)
  * Find the #GdkDisplay corresponding to @display, if any exists.
  * 
  * Return value: the #GdkDisplay, if found, otherwise %NULL.
+ *
+ * Since: 2.2
  **/
 GdkDisplay *
 gdk_x11_lookup_xdisplay (Display *xdisplay)
@@ -630,6 +656,8 @@ _gdk_x11_display_screen_for_xrootwin (GdkDisplay *display,
  * @returns: an X display.
  *
  * Returns the X display of a #GdkDisplay.
+ *
+ * Since: 2.2
  */
 Display *
 gdk_x11_display_get_xdisplay (GdkDisplay  *display)
@@ -794,9 +822,10 @@ broadcast_xmessage   (GdkDisplay   *display,
  * windows.
  * 
  * GTK+ will call this function automatically after opening the first
- * #GtkWindow unless
- * gtk_window_set_auto_startup_notification() is called to disable
- * that feature.
+ * #GtkWindow unless gtk_window_set_auto_startup_notification() is called 
+ * to disable that feature.
+ *
+ * Since: 2.2
  **/
 void
 gdk_notify_startup_complete (void)
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 500bcff3c3..2257444929 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -2794,6 +2794,8 @@ gdk_drag_begin (GdkWindow     *window,
  *     support Drag and Drop.
  *
  * Finds out the DND protocol supported by a window.
+ *
+ * Since: 2.2
  */ 
 guint32
 gdk_drag_get_protocol_for_display (GdkDisplay      *display,
@@ -2909,6 +2911,8 @@ drag_context_find_window_cache (GdkDragContext  *context,
  *
  * This function is called by the drag source to obtain the 
  * @dest_window and @protocol parameters for gdk_drag_motion().
+ *
+ * Since: 2.2
  **/
 void
 gdk_drag_find_window_for_screen (GdkDragContext  *context,
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index b21098b4a1..a97e204e95 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -315,6 +315,7 @@ gdk_event_apply_filters (XEvent *xevent,
  *
  * Adds a filter to be called when X ClientMessage events are received.
  *
+ * Since: 2.2
  **/ 
 void 
 gdk_display_add_client_message_filter (GdkDisplay   *display,
@@ -1978,17 +1979,19 @@ gdk_event_dispatch (GSource    *source,
 }
 
 /**
- * gdk_event_send_client_message_for_display :
- * @display : the #GdkDisplay for the window where the message is to be sent.
- * @event : the #GdkEvent to send, which should be a #GdkEventClient.
- * @winid : the window to send the X ClientMessage event to.
+ * gdk_event_send_client_message_for_display:
+ * @display: the #GdkDisplay for the window where the message is to be sent.
+ * @event: the #GdkEvent to send, which should be a #GdkEventClient.
+ * @winid: the window to send the X ClientMessage event to.
  *
  * Sends an X ClientMessage event to a given window.
  *
  * This could be used for communicating between different applications,
  * though the amount of data is limited to 20 bytes.
  *
- * Returns : non-zero on success.
+ * Returns: non-zero on success.
+ *
+ * Since: 2.2
  */
 gboolean
 gdk_event_send_client_message_for_display (GdkDisplay     *display,
@@ -2074,8 +2077,8 @@ gdk_event_send_client_message_to_all_recurse (GdkDisplay *display,
 
 /**
  * gdk_screen_broadcast_client_message:
- * @screen : the #GdkScreen where the event will be broadcasted.
- * @event : the #GdkEvent.
+ * @screen: the #GdkScreen where the event will be broadcasted.
+ * @event: the #GdkEvent.
  *
  * Sends an X ClientMessage event to all toplevel windows on @screen.
  *
@@ -2083,6 +2086,8 @@ gdk_event_send_client_message_to_all_recurse (GdkDisplay *display,
  * as described in the Inter-Client Communication Conventions Manual (ICCCM).
  * If no windows are found with the WM_STATE property set, the message is 
  * sent to all children of the root window.
+ *
+ * Since: 2.2
  */
 
 void
@@ -2253,6 +2258,8 @@ fetch_net_wm_check_window (GdkScreen *screen)
  * Return value: the name of the window manager screen @screen, or 
  * "unknown" if the window manager is unknown. The string is owned by GDK
  * and should not be freed.
+ *
+ * Since: 2.2
  **/
 const char*
 gdk_x11_screen_get_window_manager_name (GdkScreen *screen)
@@ -2318,13 +2325,14 @@ struct _NetWmSupportedAtoms
 
 /**
  * gdk_x11_screen_supports_net_wm_hint:
- * @screen : the relevant #GdkScreen.
+ * @screen: the relevant #GdkScreen.
  * @property: a property atom.
  * 
  * This function is specific to the X11 backend of GDK, and indicates
  * whether the window manager supports a certain hint from the
  * Extended Window Manager Hints Specification. You can find this
- * specification on http://www.freedesktop.org.
+ * specification on 
+ * <ulink url="http://www.freedesktop.org">http://www.freedesktop.org</ulink>.
  *
  * When using this function, keep in mind that the window manager
  * can change over time; so you shouldn't use this function in
@@ -2336,6 +2344,8 @@ struct _NetWmSupportedAtoms
  * a window manager change.
  * 
  * Return value: %TRUE if the window manager supports @property
+ *
+ * Since: 2.2
  **/
 gboolean
 gdk_x11_screen_supports_net_wm_hint (GdkScreen *screen,
@@ -2518,8 +2528,10 @@ check_transform (const gchar *xsettings_name,
  * FIXME needs a list of valid settings here, or a link to 
  * more information.
  * 
- * Returns : %TRUE if the setting existed and a value was stored
+ * Returns: %TRUE if the setting existed and a value was stored
  *   in @value, %FALSE otherwise.
+ *
+ * Since: 2.2
  **/
 gboolean
 gdk_screen_get_setting (GdkScreen   *screen,
diff --git a/gdk/x11/gdkfont-x11.c b/gdk/x11/gdkfont-x11.c
index 0b3a55a999..9c809cd113 100644
--- a/gdk/x11/gdkfont-x11.c
+++ b/gdk/x11/gdkfont-x11.c
@@ -98,7 +98,9 @@ gdk_fontset_name_hash_get (GdkDisplay *display)
  *
  * Returns the #GdkDisplay for @font.
  *
- * Returns : the corresponding #GdkDisplay.
+ * Returns: the corresponding #GdkDisplay.
+ *
+ * Since: 2.2
  **/
 GdkDisplay* 
 gdk_font_get_display (GdkFont* font)
@@ -174,6 +176,8 @@ gdk_font_hash_lookup (GdkDisplay  *display,
  *
  * The font may be newly loaded or looked up the font in a cache. 
  * You should make no assumptions about the initial reference count.
+ *
+ * Since: 2.2
  */
 GdkFont *
 gdk_font_load_for_display (GdkDisplay  *display, 
@@ -274,6 +278,8 @@ gdk_font_charset_for_locale (void)
  * 
  * Return value: the newly loaded font, or %NULL if the font
  * cannot be loaded.
+ *
+ * Since: 2.2
  */
 GdkFont *
 gdk_font_from_description_for_display (GdkDisplay           *display,
@@ -328,6 +334,8 @@ gdk_font_from_description_for_display (GdkDisplay           *display,
  *
  * The fontset may be newly loaded or looked up in a cache. 
  * You should make no assumptions about the initial reference count.
+ *
+ * Since: 2.2
  */
 GdkFont *
 gdk_fontset_load_for_display (GdkDisplay  *display,
diff --git a/gdk/x11/gdkgc-x11.c b/gdk/x11/gdkgc-x11.c
index 20d9f83623..84b9dfe9a9 100644
--- a/gdk/x11/gdkgc-x11.c
+++ b/gdk/x11/gdkgc-x11.c
@@ -742,6 +742,8 @@ gdk_gc_copy (GdkGC *dst_gc, GdkGC *src_gc)
  * Gets the #GdkScreen for which @gc was created
  *
  * Returns: the #GdkScreen for @gc.
+ *
+ * Since: 2.2
  */
 GdkScreen *  
 gdk_gc_get_screen (GdkGC *gc)
diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c
index f84404c014..eb9fc32ae6 100644
--- a/gdk/x11/gdkinput.c
+++ b/gdk/x11/gdkinput.c
@@ -105,12 +105,14 @@ gdk_devices_list (void)
 
 /**
  * gdk_display_list_devices:
- * @display : a #GdkDisplay
+ * @display: a #GdkDisplay
  *
  * Returns the list of available input devices attached to @display.
  * The list is statically allocated and should not be freed.
  * 
  * Return value: a list of #GdkDevice
+ *
+ * Since: 2.2
  **/
 GList * 
 gdk_display_list_devices (GdkDisplay *display)
diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index 21cc28fa3a..cec1f10d20 100644
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -185,6 +185,8 @@ get_xkb (GdkKeymapX11 *keymap_x11)
  * @returns: the #GdkKeymap attached to @display.
  *
  * Returns the #GdkKeymap attached to @display.
+ *
+ * Since: 2.2
  **/
 GdkKeymap*
 gdk_keymap_get_for_display (GdkDisplay *display)
diff --git a/gdk/x11/gdkpango-x11.c b/gdk/x11/gdkpango-x11.c
index d674889478..4645651887 100644
--- a/gdk/x11/gdkpango-x11.c
+++ b/gdk/x11/gdkpango-x11.c
@@ -41,6 +41,8 @@
  * the widget you intend to render text onto.
  * 
  * Return value: a new #PangoContext for @screen
+ *
+ * Since: 2.2
  **/
 PangoContext *
 gdk_pango_context_get_for_screen (GdkScreen *screen)
diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c
index 459d9f23c4..9d72765331 100644
--- a/gdk/x11/gdkpixmap-x11.c
+++ b/gdk/x11/gdkpixmap-x11.c
@@ -323,7 +323,7 @@ gdk_pixmap_create_from_data (GdkWindow   *window,
  * @display: The #GdkDisplay where @anid is located.
  * @anid: a native pixmap handle.
  * 
- * Wraps a native window in a #GdkPixmap.
+ * Wraps a native pixmap in a #GdkPixmap.
  * This may fail if the pixmap has been destroyed.
  *
  * For example in the X backend, a native pixmap handle is an Xlib
@@ -331,6 +331,8 @@ gdk_pixmap_create_from_data (GdkWindow   *window,
  *
  * Return value: the newly-created #GdkPixmap wrapper for the 
  *    native pixmap or %NULL if the pixmap has been destroyed.
+ *
+ * Since: 2.2
  **/
 GdkPixmap *
 gdk_pixmap_foreign_new_for_display (GdkDisplay      *display,
@@ -417,7 +419,7 @@ gdk_pixmap_lookup (GdkNativeWindow anid)
 
 /**
  * gdk_pixmap_lookup_for_display:
- * @display : the #GdkDisplay associated with @anid
+ * @display: the #GdkDisplay associated with @anid
  * @anid: a native pixmap handle.
  * 
  * Looks up the #GdkPixmap that wraps the given native pixmap handle.
@@ -425,8 +427,10 @@ gdk_pixmap_lookup (GdkNativeWindow anid)
  * For example in the X backend, a native pixmap handle is an Xlib
  * <type>XID</type>.
  *
- * Return value: the #GdkWindow wrapper for the native window,
+ * Return value: the #GdkPixmap wrapper for the native pixmap,
  *    or %NULL if there is none.
+ *
+ * Since: 2.2
  **/
 GdkPixmap*
 gdk_pixmap_lookup_for_display (GdkDisplay *display, GdkNativeWindow anid)
diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 162d16b557..139c5b52c8 100644
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -151,6 +151,8 @@ insert_atom_pair (GdkDisplay *display,
  * with the same string value.
  * 
  * Return value: the X atom corresponding to @atom.
+ *
+ * Since: 2.2
  **/
 Atom
 gdk_x11_atom_to_xatom_for_display (GdkDisplay *display, 
@@ -211,6 +213,8 @@ gdk_x11_atom_to_xatom (GdkAtom atom)
  * #GdkAtom.
  * 
  * Return value: the corresponding #GdkAtom.
+ *
+ * Since: 2.2
  **/
 GdkAtom
 gdk_x11_xatom_to_atom_for_display (GdkDisplay *display,
@@ -338,9 +342,11 @@ gdk_atom_name (GdkAtom atom)
  * 
  * Returns the X atom for a #GdkDisplay corresponding to @atom_name.
  * This function caches the result, so if called repeatedly it is much
- * faster than XInternAtom, which is a round trip to the server each time.
+ * faster than XInternAtom(), which is a round trip to the server each time.
  * 
  * Return value: a X atom for a #GdkDisplay
+ *
+ * Since: 2.2
  **/
 Atom
 gdk_x11_get_xatom_by_name_for_display (GdkDisplay  *display,
@@ -371,7 +377,7 @@ gdk_x11_get_xatom_by_name (const gchar *atom_name)
 
 /**
  * gdk_x11_get_xatom_name_for_display:
- * @display : the #GdkDisplay where @xatom is defined
+ * @display: the #GdkDisplay where @xatom is defined
  * @xatom: an X atom 
  * 
  * Returns the name of an X atom for its display. This
@@ -379,8 +385,10 @@ gdk_x11_get_xatom_by_name (const gchar *atom_name)
  * XAtomName() and gdk_atom_name(), the result doesn't need to
  * be freed. 
  *
- * Return value: name of the X atom; this string is owned by GTK+,
+ * Return value: name of the X atom; this string is owned by GDK,
  *   so it shouldn't be modifed or freed. 
+ *
+ * Since: 2.2
  **/
 G_CONST_RETURN gchar *
 gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index c8f819727b..3ad5cd9f11 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -110,6 +110,8 @@ gdk_screen_x11_class_init (GdkScreenX11Class *klass)
  * Gets the display to which the @screen belongs.
  * 
  * Returns: the display to which @screen belongs
+ *
+ * Since: 2.2
  **/
 GdkDisplay *
 gdk_screen_get_display (GdkScreen *screen)
@@ -125,6 +127,8 @@ gdk_screen_get_display (GdkScreen *screen)
  * Gets the width of @screen in pixels
  * 
  * Returns: the width of @screen in pixels.
+ *
+ * Since: 2.2
  **/
 gint
 gdk_screen_get_width (GdkScreen *screen)
@@ -141,6 +145,8 @@ gdk_screen_get_width (GdkScreen *screen)
  * Gets the height of @screen in pixels
  * 
  * Returns: the height of @screen in pixels.
+ *
+ * Since: 2.2
  **/
 gint
 gdk_screen_get_height (GdkScreen *screen)
@@ -158,6 +164,8 @@ gdk_screen_get_height (GdkScreen *screen)
  * Note that on some X servers this value will not be correct.
  * 
  * Returns: the width of @screen in pixels.
+ *
+ * Since: 2.2
  **/
 gint
 gdk_screen_get_width_mm (GdkScreen *screen)
@@ -175,6 +183,8 @@ gdk_screen_get_width_mm (GdkScreen *screen)
  * Note that on some X servers this value will not be correct.
  * 
  * Returns: the heigth of @screen in pixels.
+ *
+ * Since: 2.2
  **/
 gint
 gdk_screen_get_height_mm (GdkScreen *screen)
@@ -192,6 +202,8 @@ gdk_screen_get_height_mm (GdkScreen *screen)
  * to which it belongs. (See gdk_screen_get_display())
  * 
  * Returns: the index
+ *
+ * Since: 2.2
  **/
 gint
 gdk_screen_get_number (GdkScreen *screen)
@@ -208,6 +220,8 @@ gdk_screen_get_number (GdkScreen *screen)
  * Gets the root window of @screen. 
  * 
  * Returns: the root window
+ *
+ * Since: 2.2
  **/
 GdkWindow *
 gdk_screen_get_root_window (GdkScreen *screen)
@@ -224,6 +238,8 @@ gdk_screen_get_root_window (GdkScreen *screen)
  * Gets the default colormap for @screen.
  * 
  * Returns: the default #GdkColormap.
+ *
+ * Since: 2.2
  **/
 GdkColormap *
 gdk_screen_get_default_colormap (GdkScreen *screen)
@@ -239,6 +255,8 @@ gdk_screen_get_default_colormap (GdkScreen *screen)
  * @colormap: a #GdkColormap
  *
  * Sets the default @colormap for @screen.
+ *
+ * Since: 2.2
  **/
 void
 gdk_screen_set_default_colormap (GdkScreen   *screen,
@@ -304,12 +322,14 @@ gdk_screen_x11_finalize (GObject *object)
 
 /**
  * gdk_screen_get_n_monitors:
- * @screen : a #GdkScreen.
+ * @screen: a #GdkScreen.
  *
  * Returns the number of monitors being part of the virtual screen
  *
  * Returns: number of monitors part of the virtual screen or
  *          0 if @screen is not in virtual screen mode.
+ *
+ * Since: 2.2
  **/
 gint 
 gdk_screen_get_n_monitors (GdkScreen *screen)
@@ -332,6 +352,7 @@ gdk_screen_get_n_monitors (GdkScreen *screen)
  * Note that the virtual screen coordinates can be retrieved via 
  * gdk_screen_get_width() and gdk_screen_get_height().
  *
+ * Since: 2.2
  **/
 void 
 gdk_screen_get_monitor_geometry (GdkScreen    *screen,
@@ -351,6 +372,8 @@ gdk_screen_get_monitor_geometry (GdkScreen    *screen,
  * @returns: an Xlib <type>Screen*</type>
  *
  * Returns the screen of a #GdkScreen.
+ *
+ * Since: 2.2
  */
 Screen *
 gdk_x11_screen_get_xscreen (GdkScreen *screen)
@@ -366,6 +389,8 @@ gdk_x11_screen_get_xscreen (GdkScreen *screen)
  *   its display.
  *
  * Returns the index of a #GdkScreen.
+ *
+ * Since: 2.2
  */
 int
 gdk_x11_screen_get_screen_number (GdkScreen *screen)
@@ -608,6 +633,8 @@ _gdk_windowing_substitute_screen_number (const gchar *display_name,
  * a #GdkDisplay with this screen as the default screen.
  * 
  * Return value: a newly allocated string, free with g_free()
+ *
+ * Since: 2.2
  **/
 gchar *
 gdk_screen_make_display_name (GdkScreen *screen)
diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index 0f55b77f4b..5a83ccdbc1 100644
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@@ -101,20 +101,22 @@ _gdk_selection_filter_clear_event (XSelectionClearEvent *event)
 }
 /**
  * gdk_selection_owner_set_for_display:
- * @display : the #GdkDisplay.
- * @owner : a GdkWindow or NULL to indicate that the the owner for
- * the given should be unset.
- * @selection : an atom identifying a selection.
- * @time_ : timestamp to use when setting the selection. 
- * If this is older than the timestamp given last time the owner was 
- * set for the given selection, the request will be ignored.
- * @send_event : if TRUE, and the new owner is different from the current
- * owner, the current owner will be sent a SelectionClear event.
+ * @display: the #GdkDisplay.
+ * @owner: a #GdkWindow or %NULL to indicate that the the owner for
+ *         the given should be unset.
+ * @selection: an atom identifying a selection.
+ * @time_: timestamp to use when setting the selection. 
+ *         If this is older than the timestamp given last time the owner was 
+ *         set for the given selection, the request will be ignored.
+ * @send_event: if %TRUE, and the new owner is different from the current
+ *              owner, the current owner will be sent a SelectionClear event.
  *
  * Sets the #GdkWindow @owner as the current owner of the selection @selection.
  * 
- * Returns : TRUE if the selection owner was succesfully changed to owner,
- *	     otherwise FALSE. 
+ * Returns: %TRUE if the selection owner was successfully changed to owner,
+ *	    otherwise %FALSE. 
+ *
+ * Since: 2.2
  */
 gboolean
 gdk_selection_owner_set_for_display (GdkDisplay *display,
@@ -179,9 +181,9 @@ gdk_selection_owner_set_for_display (GdkDisplay *display,
 }
 
 /**
- * gdk_selection_owner_get_for_display :
- * @display : a #GdkDisplay.
- * @selection : an atom indentifying a selection.
+ * gdk_selection_owner_get_for_display:
+ * @display: a #GdkDisplay.
+ * @selection: an atom indentifying a selection.
  *
  * Determine the owner of the given selection.
  *
@@ -189,11 +191,12 @@ gdk_selection_owner_set_for_display (GdkDisplay *display,
  * process if a foreign window was previously created for that
  * window, but a new foreign window will never be created by this call. 
  *
- * Returns :if there is a selection owner for this window,
- * and it is a window known to the current process, the GdkWindow that owns 
- * the selection, otherwise NULL.
+ * Returns: if there is a selection owner for this window, and it is a 
+ *    window known to the current process, the #GdkWindow that owns the 
+ *    selection, otherwise %NULL.
+ *
+ * Since: 2.2
  */ 
-
 GdkWindow *
 gdk_selection_owner_get_for_display (GdkDisplay *display,
 				     GdkAtom     selection)
@@ -364,15 +367,17 @@ gdk_selection_property_get (GdkWindow  *requestor,
 
 /**
  * gdk_selection_send_notify_for_display:
- * @display : the #GdkDisplay where @requestor is realized
- * @requestor : window to which to deliver response.
- * @selection : selection that was requested.
- * @target : target that was selected.
- * @property : property in which the selection owner stored the data,
- * or GDK_NONE to indicate that the request was rejected.
- * @time_ : timestamp. 
+ * @display: the #GdkDisplay where @requestor is realized
+ * @requestor: window to which to deliver response.
+ * @selection: selection that was requested.
+ * @target: target that was selected.
+ * @property: property in which the selection owner stored the data,
+ *            or %GDK_NONE to indicate that the request was rejected.
+ * @time_: timestamp. 
  *
  * Send a response to SelectionRequest event.
+ *
+ * Since: 2.2
  **/
 void
 gdk_selection_send_notify_for_display (GdkDisplay *display,
@@ -402,22 +407,24 @@ gdk_selection_send_notify_for_display (GdkDisplay *display,
  * gdk_text_property_to_text_list_for_display:
  * @display: The #GdkDisplay where the encoding is defined.
  * @encoding: an atom representing the encoding. The most 
- * common values for this are STRING, or COMPOUND_TEXT. 
- * This is value used as the type for the property.
+ *    common values for this are STRING, or COMPOUND_TEXT. 
+ *    This is value used as the type for the property.
  * @format: the format of the property.
  * @text: The text data.
  * @length: The number of items to transform.
  * @list: location to store a terminated array of strings in 
- * the encoding of the current locale. This array should be 
- * freed using gdk_free_text_list().
+ *    the encoding of the current locale. This array should be 
+ *    freed using gdk_free_text_list().
  *
  * Convert a text string from the encoding as it is stored 
  * in a property into an array of strings in the encoding of
- * the current local. (The elements of the array represent the
- * null-separated elements of the original text string.)
+ * the current locale. (The elements of the array represent the
+ * nul-separated elements of the original text string.)
  *
- * Returns : the number of strings stored in list, or 0, 
+ * Returns: the number of strings stored in list, or 0, 
  * if the conversion failed. 
+ *
+ * Since: 2.2
  */
 gint
 gdk_text_property_to_text_list_for_display (GdkDisplay   *display,
@@ -545,11 +552,13 @@ make_list (const gchar  *text,
  * @list:     location to store the list of strings or %NULL. The
  *            list should be freed with g_strfreev().
  * 
- * Converts a text property in the giving encoding to
+ * Converts a text property in the given encoding to
  * a list of UTF-8 strings. 
  * 
  * Return value: the number of strings in the resulting
  *               list.
+ *
+ * Since: 2.2
  **/
 gint 
 gdk_text_property_to_utf8_list_for_display (GdkDisplay    *display,
@@ -634,8 +643,8 @@ gdk_text_property_to_utf8_list_for_display (GdkDisplay    *display,
 
 /**
  * gdk_string_to_compound_text_for_display:
- * @display : the #GdkDisplay where the encoding is defined.
- * @str	    : a null-terminated string.
+ * @display:  the #GdkDisplay where the encoding is defined.
+ * @str:      a nul-terminated string.
  * @encoding: location to store the encoding atom 
  *	      (to be used as the type for the property).
  * @format:   location to store the format of the property
@@ -645,7 +654,9 @@ gdk_text_property_to_utf8_list_for_display (GdkDisplay    *display,
  * Convert a string from the encoding of the current 
  * locale into a form suitable for storing in a window property.
  * 
- * Returns : 0 upon sucess, non-zero upon failure. 
+ * Returns: 0 upon sucess, non-zero upon failure. 
+ *
+ * Since: 2.2
  **/
 gint
 gdk_string_to_compound_text_for_display (GdkDisplay  *display,
@@ -777,6 +788,8 @@ gdk_utf8_to_string_target (const gchar *str)
  * 
  * Return value: %TRUE if the conversion succeeded, otherwise
  *               %FALSE.
+ *
+ * Since: 2.2
  **/
 gboolean
 gdk_utf8_to_compound_text_for_display (GdkDisplay  *display,
diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
index 7de7912216..b1eae4e1f2 100644
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.c
@@ -341,13 +341,15 @@ gdk_visual_get_best_type (void)
 
 /**
  * gdk_screen_get_system_visual:
- * @screen : a #GdkScreen.
+ * @screen: a #GdkScreen.
  * 
  * Get the system's default visual for @screen.
  * This is the visual for the root window of the display.
  * The return value should not be freed.
  * 
- * Return value: system visual
+ * Return value: the system visual
+ *
+ * Since: 2.2
  **/
 GdkVisual *
 gdk_screen_get_system_visual (GdkScreen * screen)
@@ -507,7 +509,7 @@ gdk_query_visual_types (GdkVisualType **visual_types,
 
 /**
  * gdk_screen_list_visuals:
- *  @screen : the relevant #GdkScreen.
+ * @screen: the relevant #GdkScreen.
  *  
  * Lists the available visuals for the specified @screen.
  * A visual describes a hardware image data format.
@@ -516,7 +518,10 @@ gdk_query_visual_types (GdkVisualType **visual_types,
  *
  * Call g_list_free() on the return value when you're finished with it.
  * 
- * Return value: a list of visuals; the list must be freed, but not its contents
+ * Return value: a list of visuals; the list must be freed, but not its 
+ * contents
+ *
+ * Since: 2.2
  **/
 GList *
 gdk_screen_list_visuals (GdkScreen *screen)
@@ -537,7 +542,7 @@ gdk_screen_list_visuals (GdkScreen *screen)
 }
 
 /**
- * gdk_x11_screen_lookup_visual
+ * gdk_x11_screen_lookup_visual:
  * @screen: a #GdkScreen.
  * @xvisualid: an X Visual ID.
  *
@@ -545,6 +550,8 @@ gdk_screen_list_visuals (GdkScreen *screen)
  *
  * Returns: the #GdkVisual (owned by the screen object), or %NULL
  *   if the visual ID wasn't found.
+ *
+ * Since: 2.2
  */
 GdkVisual *
 gdk_x11_screen_lookup_visual (GdkScreen *screen,
@@ -646,6 +653,8 @@ gdk_x11_visual_get_xvisual (GdkVisual *visual)
  * Gets the screen to which this visual belongs
  * 
  * Return value: the screen to which this visual belongs.
+ *
+ * Since: 2.2
  **/
 GdkScreen *
 gdk_visual_get_screen (GdkVisual *visual)
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 3904619f93..14602a20cd 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -734,6 +734,8 @@ x_event_mask_to_gdk_event_mask (long mask)
  * 
  * Return value: the newly-created #GdkWindow wrapper for the 
  *    native window or %NULL if the window has been destroyed.
+ *
+ * Since: 2.2
  **/
 GdkWindow *
 gdk_window_foreign_new_for_display (GdkDisplay     *display,
@@ -820,6 +822,8 @@ gdk_window_foreign_new_for_display (GdkDisplay     *display,
  *
  * Return value: the #GdkWindow wrapper for the native window, 
  *    or %NULL if there is none.
+ *
+ * Since: 2.2
  **/
 GdkWindow *
 gdk_window_lookup_for_display (GdkDisplay *display, GdkNativeWindow anid)
@@ -1761,6 +1765,8 @@ gdk_window_set_modal_hint (GdkWindow *window,
  * function should NOT be called in addition, instead you should allow
  * the window to be treated according to standard policy for its
  * semantic type.
+ *
+ * Since: 2.2
  **/
 void
 gdk_window_set_skip_taskbar_hint (GdkWindow *window,
@@ -1798,6 +1804,8 @@ gdk_window_set_skip_taskbar_hint (GdkWindow *window,
  * already fully describes the window, this function should NOT be
  * called in addition, instead you should allow the window to be
  * treated according to standard policy for its semantic type.
+ *
+ * Since: 2.2
  **/
 void
 gdk_window_set_skip_pager_hint (GdkWindow *window,
@@ -3595,6 +3603,7 @@ gdk_window_unmaximize (GdkWindow *window)
  * most standard window managers, and GDK makes a best effort to get
  * it to happen.
  *
+ * Since: 2.2
  **/
 void
 gdk_window_fullscreen (GdkWindow *window)
@@ -3628,8 +3637,9 @@ gdk_window_fullscreen (GdkWindow *window)
  * don't have a concept of "fullscreen"; so you can't rely on the
  * unfullscreenification actually happening. But it will happen with
  * most standard window managers, and GDK makes a best effort to get
- * it to happen.
- * 
+ * it to happen. 
+ *
+ * Since: 2.2
  **/
 void
 gdk_window_unfullscreen (GdkWindow *window)
diff --git a/gdk/x11/gdkxid.c b/gdk/x11/gdkxid.c
index 92c8cecb47..ac851208b8 100644
--- a/gdk/x11/gdkxid.c
+++ b/gdk/x11/gdkxid.c
@@ -68,12 +68,14 @@ _gdk_xid_table_remove (GdkDisplay *display,
 
 /** 
  * gdk_xid_table_lookup_for_display:
- * @display : the #GdkDisplay.
- * @xid : an X id.
+ * @display: the #GdkDisplay.
+ * @xid: an X id.
  *
- * Returns the Gdk object associated with the given X id.
+ * Returns the GDK object associated with the given X id.
+ *
+ * Returns: a GDK object associated with the given X id.
  *
- * Returns: an GdkObject associated with the given X id.
+ * Since: 2.2
  */
 gpointer
 gdk_xid_table_lookup_for_display (GdkDisplay  *display,