Make 3.0 parallel-installable to 2.x

In particular, rename

  - libraries to lib*-3.0.so
  - pc files to *-3.0.pc
  - include paths to /usr/include/gtk-3.0/*
  - module paths to /usr/lib/gtk-3.0/*
  - rc files names to gtk-3.0/gtkrc
  - commandline utilities to *-3.0
  - adjust documentation

Also change the install location for unix-print headers to
/usr/include/gtk-3.0/unix-print/gtk.

31 files changed, 168 insertions, 10 deletions

diff --git a/docs/reference/gdk/tmpl/cairo_interaction.sgml b/docs/reference/gdk/tmpl/cairo_interaction.sgml
index 7ada736cf6..fc7fbf56ad 100644
--- a/docs/reference/gdk/tmpl/cairo_interaction.sgml
+++ b/docs/reference/gdk/tmpl/cairo_interaction.sgml
@@ -27,6 +27,9 @@ Cairo paths and to use pixbufs as sources for drawing operations.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_cairo_create ##### -->
 <para>
 
diff --git a/docs/reference/gdk/tmpl/colors.sgml b/docs/reference/gdk/tmpl/colors.sgml
index 31a09f72ae..3d1a8749f1 100644
--- a/docs/reference/gdk/tmpl/colors.sgml
+++ b/docs/reference/gdk/tmpl/colors.sgml
@@ -46,6 +46,9 @@ gdk_color_change() will probably become aliases.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkColor ##### -->
 <para>
 The #GdkColor structure is used to describe an 
@@ -102,6 +105,7 @@ The colormap structure contains the following public fields.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -109,6 +113,7 @@ The colormap structure contains the following public fields.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
diff --git a/docs/reference/gdk/tmpl/cursors.sgml b/docs/reference/gdk/tmpl/cursors.sgml
index 8d45cfab08..89abff656b 100644
--- a/docs/reference/gdk/tmpl/cursors.sgml
+++ b/docs/reference/gdk/tmpl/cursors.sgml
@@ -31,6 +31,9 @@ gdk_window_set_cursor() or by setting the cursor member of the
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkCursor ##### -->
 <para>
 A <type>GdkCursor</type> structure represents a cursor.
@@ -212,3 +215,5 @@ The standard cursors available.
 </para>
 
 @cursor: 
+
+
diff --git a/docs/reference/gdk/tmpl/dnd.sgml b/docs/reference/gdk/tmpl/dnd.sgml
index 3d1b521c7c..dd9c18b30d 100644
--- a/docs/reference/gdk/tmpl/dnd.sgml
+++ b/docs/reference/gdk/tmpl/dnd.sgml
@@ -25,6 +25,9 @@ the GTK+ documentation for more information.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_drag_get_selection ##### -->
 <para>
 </para>
@@ -54,6 +57,7 @@ the GTK+ documentation for more information.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
diff --git a/docs/reference/gdk/tmpl/drawing.sgml b/docs/reference/gdk/tmpl/drawing.sgml
index 73071405cf..9cd73f81f3 100644
--- a/docs/reference/gdk/tmpl/drawing.sgml
+++ b/docs/reference/gdk/tmpl/drawing.sgml
@@ -34,6 +34,9 @@ gtk_widget_create_pango_layout().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkDrawable ##### -->
 <para>
 An opaque structure representing an object that can be
diff --git a/docs/reference/gdk/tmpl/event_structs.sgml b/docs/reference/gdk/tmpl/event_structs.sgml
index cd94fdebc7..42c54b06f2 100644
--- a/docs/reference/gdk/tmpl/event_structs.sgml
+++ b/docs/reference/gdk/tmpl/event_structs.sgml
@@ -23,6 +23,9 @@ required events are received. See gtk_widget_set_events().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### UNION GdkEvent ##### -->
 <para>
 The #GdkEvent struct contains a union of all of the event structs,
diff --git a/docs/reference/gdk/tmpl/events.sgml b/docs/reference/gdk/tmpl/events.sgml
index efb9e3e873..392cd078e5 100644
--- a/docs/reference/gdk/tmpl/events.sgml
+++ b/docs/reference/gdk/tmpl/events.sgml
@@ -30,6 +30,9 @@ The structs used for each type of event.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM GdkEventType ##### -->
 <para>
 Specifies the type of the event.
@@ -165,6 +168,7 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -172,6 +176,7 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -179,6 +184,7 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -332,6 +338,7 @@ gdk_event_handler_set().
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
diff --git a/docs/reference/gdk/tmpl/fonts.sgml b/docs/reference/gdk/tmpl/fonts.sgml
index 25efd2dc48..1f68fb732d 100644
--- a/docs/reference/gdk/tmpl/fonts.sgml
+++ b/docs/reference/gdk/tmpl/fonts.sgml
@@ -264,6 +264,9 @@ here).
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkFont ##### -->
 <para>
 The <structname>GdkFont</structname> structure represents a font or fontset. It
diff --git a/docs/reference/gdk/tmpl/gcs.sgml b/docs/reference/gdk/tmpl/gcs.sgml
index 7d445ede7a..2897bcb35f 100644
--- a/docs/reference/gdk/tmpl/gcs.sgml
+++ b/docs/reference/gdk/tmpl/gcs.sgml
@@ -33,6 +33,9 @@ be set by the latter method.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkGC ##### -->
 <para>
 The #GdkGC structure represents a graphics context.
diff --git a/docs/reference/gdk/tmpl/gdk-unused.sgml b/docs/reference/gdk/tmpl/gdk-unused.sgml
index adb7170f01..13b0c19c3e 100644
--- a/docs/reference/gdk/tmpl/gdk-unused.sgml
+++ b/docs/reference/gdk/tmpl/gdk-unused.sgml
@@ -923,6 +923,14 @@ they will be ignored.
 </para>
 
 
+<!-- ##### MACRO gdk_rgb_get_cmap ##### -->
+<para>
+Gets the colormap set by GdkRGB. This colormap and the corresponding
+visual should be used when creating windows that will be drawn in by GdkRGB.
+</para>
+
+@Returns: The #GdkColormap set by GdkRGB.
+
 <!-- ##### VARIABLE gdk_screen ##### -->
 <para>
 
diff --git a/docs/reference/gdk/tmpl/gdkapplaunchcontext.sgml b/docs/reference/gdk/tmpl/gdkapplaunchcontext.sgml
index 2d1f8ff9ca..78928a4ebe 100644
--- a/docs/reference/gdk/tmpl/gdkapplaunchcontext.sgml
+++ b/docs/reference/gdk/tmpl/gdkapplaunchcontext.sgml
@@ -36,6 +36,9 @@ g_object_unref (context);
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### TYPEDEF GdkAppLaunchContext ##### -->
 <para>
 An opaque structure representing an application launch context.
@@ -47,6 +50,7 @@ An opaque structure representing an application launch context.
 
 </para>
 
+@void: 
 @Returns: 
 
 
diff --git a/docs/reference/gdk/tmpl/gdkdisplay.sgml b/docs/reference/gdk/tmpl/gdkdisplay.sgml
index 36e3296be9..19a7798c5f 100644
--- a/docs/reference/gdk/tmpl/gdkdisplay.sgml
+++ b/docs/reference/gdk/tmpl/gdkdisplay.sgml
@@ -31,6 +31,9 @@ Controls the keyboard/mouse pointer grabs and a set of <type>GdkScreen</type>s
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkDisplay ##### -->
 <para>
 The <structname>GdkDisplay</structname> struct is the GDK representation
@@ -61,6 +64,7 @@ of an X display. All its fields are private and should not be accessed directly.
 
 </para>
 
+@void: 
 @Returns: 
 
 
diff --git a/docs/reference/gdk/tmpl/gdkdisplaymanager.sgml b/docs/reference/gdk/tmpl/gdkdisplaymanager.sgml
index a2b65dc3ff..253c5eda61 100644
--- a/docs/reference/gdk/tmpl/gdkdisplaymanager.sgml
+++ b/docs/reference/gdk/tmpl/gdkdisplaymanager.sgml
@@ -19,6 +19,9 @@ changes.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkDisplayManager ##### -->
 <para>
 The <structname>GdkDisplayManager</structname> struct has no interesting 
@@ -45,6 +48,7 @@ fields.
 
 </para>
 
+@void: 
 @Returns: 
 
 
diff --git a/docs/reference/gdk/tmpl/gdkscreen.sgml b/docs/reference/gdk/tmpl/gdkscreen.sgml
index 64784c54d4..eeeed17c14 100644
--- a/docs/reference/gdk/tmpl/gdkscreen.sgml
+++ b/docs/reference/gdk/tmpl/gdkscreen.sgml
@@ -25,6 +25,9 @@ form a large screen area.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkScreen ##### -->
 <para>
 This is a currently just a placeholder typedef for the first argument of 
@@ -70,6 +73,7 @@ when GDK gets multihead support.
 
 </para>
 
+@void: 
 @Returns: 
 
 
diff --git a/docs/reference/gdk/tmpl/gdktesting.sgml b/docs/reference/gdk/tmpl/gdktesting.sgml
index c1ce047ab2..f8e787a4a5 100644
--- a/docs/reference/gdk/tmpl/gdktesting.sgml
+++ b/docs/reference/gdk/tmpl/gdktesting.sgml
@@ -18,6 +18,9 @@ They allow to simulate some user input.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_test_render_sync ##### -->
 <para>
 
diff --git a/docs/reference/gdk/tmpl/general.sgml b/docs/reference/gdk/tmpl/general.sgml
index 41f0c72a03..3278731c8c 100644
--- a/docs/reference/gdk/tmpl/general.sgml
+++ b/docs/reference/gdk/tmpl/general.sgml
@@ -18,6 +18,9 @@ utility functions.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_init ##### -->
 <para>
 Initializes the GDK library and connects to the X server.
@@ -70,6 +73,7 @@ by GTK+ applications.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -94,6 +98,7 @@ If the locale is not supported by X then it is reset to the standard "C"
 locale.
 </para>
 
+@void: 
 @Returns: the resulting locale.
 
 
@@ -123,6 +128,7 @@ of g_atexit()).
 
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_notify_startup_complete_with_id ##### -->
@@ -141,6 +147,7 @@ commandline option, the default value is the program name (determined
 with g_get_prgname()) with the first character converted to uppercase. 
 </para>
 
+@void: 
 @Returns: the program class.
 
 
@@ -160,6 +167,7 @@ Gets the name of the display, which usually comes from the <envar>DISPLAY</envar
 environment variable or the <option>--display</option> command line option.
 </para>
 
+@void: 
 @Returns: the name of the display.
 
 
@@ -170,12 +178,14 @@ by the server. This is rarely needed by applications. It's main use is for
 trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_screen_width ##### -->
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -183,6 +193,7 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -190,6 +201,7 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -197,6 +209,7 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -279,6 +292,7 @@ success or the reason for the failure of the grab attempt.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -324,6 +338,7 @@ available.
 <para>
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_get_use_xshm ##### -->
@@ -338,6 +353,7 @@ SYSV shared memory calls. However, it can only be used if the X client and
 server are on the same machine and the server supports it.
 </para>
 
+@void: 
 @Returns: %TRUE if use of the MIT shared memory extension will be attempted.
 
 
@@ -375,6 +391,7 @@ avoid the X error in any other way.
 </programlisting>
 </example>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_error_trap_pop ##### -->
@@ -382,6 +399,7 @@ avoid the X error in any other way.
 Removes the X error trap installed with gdk_error_trap_push().
 </para>
 
+@void: 
 @Returns: the X error code, or 0 if no error occurred.
 
 
diff --git a/docs/reference/gdk/tmpl/images.sgml b/docs/reference/gdk/tmpl/images.sgml
index a9a6cd75ef..0973635643 100644
--- a/docs/reference/gdk/tmpl/images.sgml
+++ b/docs/reference/gdk/tmpl/images.sgml
@@ -57,6 +57,9 @@ displays.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkImage ##### -->
 <para>
 The #GdkImage struct contains information on the image and the pixel data.
diff --git a/docs/reference/gdk/tmpl/input.sgml b/docs/reference/gdk/tmpl/input.sgml
index 0ffe255a89..41377caaa6 100644
--- a/docs/reference/gdk/tmpl/input.sgml
+++ b/docs/reference/gdk/tmpl/input.sgml
@@ -34,6 +34,9 @@ callbacks.</para></listitem>
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_input_add_full ##### -->
 
 
diff --git a/docs/reference/gdk/tmpl/input_devices.sgml b/docs/reference/gdk/tmpl/input_devices.sgml
index 4a163fe71a..e31cd9e1c3 100644
--- a/docs/reference/gdk/tmpl/input_devices.sgml
+++ b/docs/reference/gdk/tmpl/input_devices.sgml
@@ -87,6 +87,9 @@ and <structfield>ytilt</structfield>.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkDevice ##### -->
 <para>
 A <structname>GdkDevice</structname> structure contains
@@ -174,6 +177,7 @@ types that GTK+ understands.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -224,6 +228,7 @@ Specifies how an axis of a device is used.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
diff --git a/docs/reference/gdk/tmpl/keys.sgml b/docs/reference/gdk/tmpl/keys.sgml
index 9c67e094cc..dc0083407c 100644
--- a/docs/reference/gdk/tmpl/keys.sgml
+++ b/docs/reference/gdk/tmpl/keys.sgml
@@ -88,6 +88,9 @@ gdk_keymap_translate_keyboard_state() just to get the keyval.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkKeymap ##### -->
 <para>
 A <structname>GdkKeymap</structname> defines the translation from keyboard state
@@ -143,6 +146,7 @@ be mapped to a keyval.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -234,6 +238,15 @@ Returns: %PANGO_DIRECTION_LTR or %PANGO_DIRECTION_RTL.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_keymap_add_virtual_modifiers ##### -->
+<para>
+
+</para>
+
+@keymap: 
+@state: 
+
+
 <!-- ##### FUNCTION gdk_keymap_map_virtual_modifiers ##### -->
 <para>
 
diff --git a/docs/reference/gdk/tmpl/pango_interaction.sgml b/docs/reference/gdk/tmpl/pango_interaction.sgml
index b03c4b1df8..b9556a9b7f 100644
--- a/docs/reference/gdk/tmpl/pango_interaction.sgml
+++ b/docs/reference/gdk/tmpl/pango_interaction.sgml
@@ -132,6 +132,9 @@ g_object_unref (gc);
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPangoRenderer ##### -->
 <para>
 
@@ -210,6 +213,7 @@ g_object_unref (gc);
 
 </para>
 
+@void: 
 @Returns: 
 
 
diff --git a/docs/reference/gdk/tmpl/pixbufs.sgml b/docs/reference/gdk/tmpl/pixbufs.sgml
index 53de271a52..9b1aacf72d 100644
--- a/docs/reference/gdk/tmpl/pixbufs.sgml
+++ b/docs/reference/gdk/tmpl/pixbufs.sgml
@@ -19,6 +19,9 @@ pixbufs, see the #GdkPixbuf API documentation.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_render_threshold_alpha ##### -->
 <para>
 
@@ -39,6 +42,12 @@ pixbufs, see the #GdkPixbuf API documentation.
 
 </para>
 
+
+<!-- ##### FUNCTION gdk_pixbuf_render_pixmap_and_mask ##### -->
+<para>
+
+</para>
+
 @pixbuf: 
 @pixmap_return: 
 @mask_return: 
diff --git a/docs/reference/gdk/tmpl/pixmaps.sgml b/docs/reference/gdk/tmpl/pixmaps.sgml
index d64418f7a5..333a2b348c 100644
--- a/docs/reference/gdk/tmpl/pixmaps.sgml
+++ b/docs/reference/gdk/tmpl/pixmaps.sgml
@@ -21,6 +21,9 @@ pixel can be either on or off).
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPixmap ##### -->
 <para>
 An opaque structure representing an offscreen drawable.
@@ -125,3 +128,5 @@ An opaque structure representing an offscreen drawable of depth
 #GdkWindow, can often be used interchangeably.  The type #GdkDrawable
 refers generically to any of these types.
 </para>
+
+
diff --git a/docs/reference/gdk/tmpl/properties.sgml b/docs/reference/gdk/tmpl/properties.sgml
index 5dc62e6da2..64a1b2d3f7 100644
--- a/docs/reference/gdk/tmpl/properties.sgml
+++ b/docs/reference/gdk/tmpl/properties.sgml
@@ -45,6 +45,9 @@ data commonly stored in X window properties.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkAtom ##### -->
 <para>
 An opaque type representing a string as an index into a table
diff --git a/docs/reference/gdk/tmpl/regions.sgml b/docs/reference/gdk/tmpl/regions.sgml
index c05c2641c3..dfb43a6dd4 100644
--- a/docs/reference/gdk/tmpl/regions.sgml
+++ b/docs/reference/gdk/tmpl/regions.sgml
@@ -36,6 +36,9 @@ It can be intersected to regions by using gdk_region_spans_intersect_foreach().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPoint ##### -->
 <para>
 Defines the x and y coordinates of a point.
@@ -86,6 +89,7 @@ A GdkRegion represents a set of pixels on the screen.
 
 </para>
 
+@void: 
 @Returns: 
 
 
diff --git a/docs/reference/gdk/tmpl/rgb.sgml b/docs/reference/gdk/tmpl/rgb.sgml
index 857558d71e..a60e73980c 100644
--- a/docs/reference/gdk/tmpl/rgb.sgml
+++ b/docs/reference/gdk/tmpl/rgb.sgml
@@ -125,6 +125,9 @@ colors.</para></listitem>
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_draw_rgb_image ##### -->
 <para>
 Draws an RGB image in the drawable. This is the core GdkRGB
@@ -360,6 +363,7 @@ private colormap.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -368,18 +372,10 @@ private colormap.
 
 </para>
 
+@void: 
 @Returns: 
 
 
-<!-- ##### MACRO gdk_rgb_get_cmap ##### -->
-<para>
-Gets the colormap set by GdkRGB. This colormap and the corresponding
-visual should be used when creating windows that will be drawn in by GdkRGB.
-</para>
-
-@Returns: The #GdkColormap set by GdkRGB.
-
-
 <!-- ##### FUNCTION gdk_rgb_ditherable ##### -->
 <para>
 Determines whether the preferred visual is ditherable. This function may be
@@ -388,6 +384,7 @@ dither mode is desired; if the display is not ditherable, it may make
 sense to gray out or hide the corresponding UI widget.
 </para>
 
+@void: 
 @Returns: %TRUE if the preferred visual is ditherable.
 
 
diff --git a/docs/reference/gdk/tmpl/selections.sgml b/docs/reference/gdk/tmpl/selections.sgml
index 413bcf3273..1ce9b894ab 100644
--- a/docs/reference/gdk/tmpl/selections.sgml
+++ b/docs/reference/gdk/tmpl/selections.sgml
@@ -50,6 +50,9 @@ to the X Inter-client Communication Conventions Manual
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO GDK_SELECTION_PRIMARY ##### -->
 <para>
 A #GdkAtom representing the <literal>PRIMARY</literal> selection.
diff --git a/docs/reference/gdk/tmpl/threads.sgml b/docs/reference/gdk/tmpl/threads.sgml
index 489b41f78e..75a61ee840 100644
--- a/docs/reference/gdk/tmpl/threads.sgml
+++ b/docs/reference/gdk/tmpl/threads.sgml
@@ -250,6 +250,9 @@ int main (int argc, char *argv[])
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO GDK_THREADS_ENTER ##### -->
 <para>
 This macro marks the beginning of a critical section in which GDK and
@@ -275,6 +278,7 @@ begun with #GDK_THREADS_ENTER.
 
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_threads_enter ##### -->
@@ -285,6 +289,7 @@ conditions.  Only one thread at a time can be in such a critial
 section.
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_threads_leave ##### -->
@@ -292,6 +297,7 @@ section.
 Leaves a critical region begun with gdk_threads_enter(). 
 </para>
 
+@void: 
 
 
 <!-- ##### VARIABLE gdk_threads_mutex ##### -->
diff --git a/docs/reference/gdk/tmpl/visuals.sgml b/docs/reference/gdk/tmpl/visuals.sgml
index 6738fc3bc5..5531d499f7 100644
--- a/docs/reference/gdk/tmpl/visuals.sgml
+++ b/docs/reference/gdk/tmpl/visuals.sgml
@@ -54,6 +54,9 @@ then %GDK_VISUAL_STATIC_GRAY.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkVisual ##### -->
 <para>
 The <type>GdkVisual</type> structure contains information about
@@ -171,6 +174,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -179,6 +183,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -187,6 +192,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -195,6 +201,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -203,6 +210,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
diff --git a/docs/reference/gdk/tmpl/windows.sgml b/docs/reference/gdk/tmpl/windows.sgml
index f9c94e01ff..9f621678a0 100644
--- a/docs/reference/gdk/tmpl/windows.sgml
+++ b/docs/reference/gdk/tmpl/windows.sgml
@@ -209,6 +209,9 @@ gdk_offscreen_window_get_pixmap().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkWindow ##### -->
 <para>
 An opaque structure representing an onscreen drawable.
@@ -984,7 +987,7 @@ Registers a window as a potential drop destination.
 
 @window: 
 @region: 
-@child_func: 
+@GdkWindow *, gpointer: 
 @user_data: 
 
 
@@ -1018,6 +1021,7 @@ Registers a window as a potential drop destination.
 
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_window_process_updates ##### -->
@@ -1745,6 +1749,7 @@ The hint must be set before mapping the window.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -1753,6 +1758,7 @@ The hint must be set before mapping the window.
 
 </para>
 
+@void: 
 @Returns: 
 
 
diff --git a/docs/reference/gdk/tmpl/x_interaction.sgml b/docs/reference/gdk/tmpl/x_interaction.sgml
index 2af1f6845d..66a5a07172 100644
--- a/docs/reference/gdk/tmpl/x_interaction.sgml
+++ b/docs/reference/gdk/tmpl/x_interaction.sgml
@@ -17,6 +17,9 @@ X backend-specific functions
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO GDK_ROOT_WINDOW ##### -->
 <para>
 Obtains the Xlib window id of the root window of the current screen. 
@@ -657,6 +660,7 @@ Since: 2.2
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -665,6 +669,7 @@ Since: 2.2
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -673,6 +678,7 @@ Since: 2.2
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -681,6 +687,7 @@ Since: 2.2
 
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_x11_image_get_xdisplay ##### -->
@@ -724,6 +731,7 @@ Since: 2.2
 
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_x11_visual_get_xvisual ##### -->