diff -dupr contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.c contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.c
--- contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.c	2011-08-16 03:45:14.000000000 +0200
+++ contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.c	2012-05-20 07:41:19.645982110 +0200
@@ -24,8 +24,8 @@
 
 /**
  * SECTION:gdk-pixbuf-xlib-init
- * @Short_description: Initializing the &gdk-pixbuf; Xlib library.
- * @Title: &gdk-pixbuf; Xlib initialization
+ * @Short_description: Initializing the gdk-pixbuf Xlib library.
+ * @Title: gdk-pixbuf Xlib initialization
  * @See_also:    XlibRGB
  * 
  * In addition to the normal Gdk-specific functions, the &gdk-pixbuf;
diff -dupr contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c
--- contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c	2011-08-16 03:45:14.000000000 +0200
+++ contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c	2012-05-20 08:35:51.748844967 +0200
@@ -474,7 +474,7 @@ xlib_rgb_colorcube_222 (void)
 
 /**
  * xlib_rgb_set_verbose:
- * @verbose: %True to be verbose
+ * @verbose: True to be verbose
  * 
  * Enables/disables debug spew.
  **/
@@ -486,7 +486,7 @@ xlib_rgb_set_verbose (Bool verbose)
 
 /**
  * xlib_rgb_set_install:
- * @install: %True to install a colormap
+ * @install: True to install a colormap
  * 
  * Sets whether we install an RGB colormap.
  **/
diff -dupr docs/reference/gdk-pixbuf/gdk-pixbuf.xml docs/reference/gdk-pixbuf/gdk-pixbuf.xml
--- docs/reference/gdk-pixbuf/gdk-pixbuf.xml	2011-12-17 01:47:20.000000000 +0100
+++ docs/reference/gdk-pixbuf/gdk-pixbuf.xml	2012-05-20 07:58:43.904850200 +0200
@@ -91,6 +91,11 @@
 
     <xi:include href="xml/gdk-pixbuf-loader.xml" />
     <xi:include href="xml/module_interface.xml" />
+
+    <xi:include href="xml/gdk-pixbuf-xlib-init.xml" />
+    <xi:include href="xml/gdk-pixbuf-xlib-rendering.xml" />
+    <xi:include href="xml/gdk-pixbuf-xlib-from-drawables.xml" />
+    <xi:include href="xml/gdk-pixbuf-xlib-rgb.xml" />
   </reference>
 
   <reference>
@@ -131,20 +136,12 @@
     <title>Index of new symbols in 2.8</title>
     <xi:include href="xml/api-index-2.8.xml"><xi:fallback /></xi:include>
   </index>
-  <index id="api-index-2-10" role="2.10">
-    <title>Index of new symbols in 2.10</title>
-    <xi:include href="xml/api-index-2.10.xml"><xi:fallback /></xi:include>
-  </index>
   <index id="api-index-2-12" role="2.12">
     <title>Index of new symbols in 2.12</title>
     <xi:include href="xml/api-index-2.12.xml"><xi:fallback /></xi:include>
   </index>
   <index id="api-index-2-14" role="2.14">
     <title>Index of new symbols in 2.14</title>
-    <xi:include href="xml/api-index-2.14.xml"><xi:fallback /></xi:include>
-  </index>
-  <index id="api-index-2-14" role="2.14">
-    <title>Index of new symbols in 2.14</title>
     <xi:include href="xml/api-index-2.14.xml"><xi:fallback /></xi:include>
   </index>
   <index id="api-index-2-26" role="2.26">
diff -dupr gdk-pixbuf/gdk-pixbuf-animation.c gdk-pixbuf/gdk-pixbuf-animation.c
--- gdk-pixbuf/gdk-pixbuf-animation.c	2011-08-16 03:45:14.000000000 +0200
+++ gdk-pixbuf/gdk-pixbuf-animation.c	2012-05-20 07:50:13.518725982 +0200
@@ -547,8 +547,8 @@ gdk_pixbuf_animation_iter_on_currently_l
  *
  * If this function returns %FALSE, there's no need to update the animation
  * display, assuming the display had been rendered prior to advancing;
- * if %TRUE, you need to call gdk_animation_iter_get_pixbuf() and update the
- * display with the new pixbuf.
+ * if %TRUE, you need to call gdk_pixbuf_animation_iter_get_pixbuf()
+ * and update the display with the new pixbuf.
  *
  * Returns: %TRUE if the image may need updating
  * 
diff -dupr gdk-pixbuf/gdk-pixbuf.c gdk-pixbuf/gdk-pixbuf.c
--- gdk-pixbuf/gdk-pixbuf.c	2011-12-17 01:47:20.000000000 +0100
+++ gdk-pixbuf/gdk-pixbuf.c	2012-05-20 08:19:01.456609573 +0200
@@ -764,7 +764,7 @@ gdk_pixbuf_get_option (GdkPixbuf   *pixb
  * @key: a nul-terminated string.
  * @value: a nul-terminated string.
  * 
- * Attaches a key/value pair as an option to a #GdkPixbuf. If %key already
+ * Attaches a key/value pair as an option to a #GdkPixbuf. If @key already
  * exists in the list of options attached to @pixbuf, the new value is 
  * ignored and %FALSE is returned.
  *
diff -dupr gdk-pixbuf/gdk-pixbuf-io.c gdk-pixbuf/gdk-pixbuf-io.c
--- gdk-pixbuf/gdk-pixbuf-io.c	2012-02-05 00:21:30.000000000 +0100
+++ gdk-pixbuf/gdk-pixbuf-io.c	2012-05-20 09:00:08.325087541 +0200
@@ -1508,7 +1508,7 @@ load_from_stream (GdkPixbufLoader  *load
  * The file format is detected automatically. If %NULL is returned, then 
  * @error will be set. The @cancellable can be used to abort the operation
  * from another thread. If the operation was cancelled, the error 
- * %GIO_ERROR_CANCELLED will be returned. Other possible errors are in 
+ * %G_IO_ERROR_CANCELLED will be returned. Other possible errors are in 
  * the #GDK_PIXBUF_ERROR and %G_IO_ERROR domains. 
  *
  * The image will be scaled to fit in the requested size, optionally 
@@ -1638,7 +1638,7 @@ gdk_pixbuf_new_from_stream_at_scale_asyn
  * The file format is detected automatically. If %NULL is returned, then 
  * @error will be set. The @cancellable can be used to abort the operation
  * from another thread. If the operation was cancelled, the error 
- * %GIO_ERROR_CANCELLED will be returned. Other possible errors are in 
+ * %G_IO_ERROR_CANCELLED will be returned. Other possible errors are in 
  * the #GDK_PIXBUF_ERROR and %G_IO_ERROR domains. 
  *
  * The stream is not closed.
@@ -2768,7 +2768,7 @@ save_to_stream (const gchar  *buffer,
  * "bmp". See gdk_pixbuf_save_to_buffer() for more details.
  *
  * The @cancellable can be used to abort the operation from another 
- * thread. If the operation was cancelled, the error %GIO_ERROR_CANCELLED 
+ * thread. If the operation was cancelled, the error %G_IO_ERROR_CANCELLED 
  * will be returned. Other possible errors are in the #GDK_PIXBUF_ERROR 
  * and %G_IO_ERROR domains. 
  *
diff -dupr gdk-pixbuf/gdk-pixdata.c gdk-pixbuf/gdk-pixdata.c
--- gdk-pixbuf/gdk-pixdata.c	2011-12-17 01:47:20.000000000 +0100
+++ gdk-pixbuf/gdk-pixdata.c	2012-05-20 08:40:48.007321030 +0200
@@ -191,7 +191,7 @@ get_uint32 (const guint8 *stream, guint
  * #GdkPixdata fields in network byte order, plus the @pixel_data
  * bytes the structure points to.
  * The @pixdata contents are reconstructed byte by byte and are checked
- * for validity. This function may fail with %GDK_PIXBUF_CORRUPT_IMAGE
+ * for validity. This function may fail with %GDK_PIXBUF_ERROR_CORRUPT_IMAGE
  * or %GDK_PIXBUF_ERROR_UNKNOWN_TYPE.
  *
  * Return value: Upon successful deserialization %TRUE is returned,
