diff --git a/ChangeLog b/ChangeLog
index 4d177cf5beffdc952a4582bf3d52c04fece5da1d..22ffc939283f5be7d3bdb061d3983ff40da5671b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-07-25  Stefan Kost  <ensonic@users.sf.net>
+
+	* configure.ac:
+	* docs/gst/gstreamer.types.in:
+	  Another conditional doc check.
+
+	* gst/gstmessage.c:
+	* gst/gstparamspecs.h:
+	* gst/gstregistrybinary.c: (gst_registry_binary_read_cache):
+	* gst/gstvalue.c:
+	* gst/gstxml.h:
+	  API-doc fixes.
+
 2007-07-24  Stefan Kost  <ensonic@users.sf.net>
 
 	* gst/gstregistrybinary.c: (gst_registry_binary_check_magic),
diff --git a/configure.ac b/configure.ac
index b16ab62d2c77b67b6c201a94251fc7f52817c4af..148b9e8dbaa49422857dc9545f91a437514de557 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,6 +106,14 @@ AG_GST_CHECK_SUBSYSTEM_DISABLE(ENUMTYPES,[enum types])
 AM_CONDITIONAL(GST_DISABLE_ENUMTYPES, test "x$GST_DISABLE_ENUMTYPES" = "xyes")
 AG_GST_CHECK_SUBSYSTEM_DISABLE(INDEX,[index])
 AM_CONDITIONAL(GST_DISABLE_INDEX, test "x$GST_DISABLE_INDEX" = "xyes")
+dnl define a substitution to use in docs/gst/gstreamer.types
+if test "x$GST_DISABLE_INDEX" = "xyes"
+then
+  GST_INDEX_DOC_TYPES="%"
+else
+  GST_INDEX_DOC_TYPES=
+fi
+AC_SUBST(GST_INDEX_DOC_TYPES)
 AG_GST_CHECK_SUBSYSTEM_DISABLE(NET,[network distribution])
 AM_CONDITIONAL(GST_DISABLE_NET, test "x$GST_DISABLE_NET" = "xyes")
 AG_GST_CHECK_SUBSYSTEM_DISABLE(PLUGIN,[plugin])
diff --git a/docs/gst/gstreamer.types.in b/docs/gst/gstreamer.types.in
index e2061bdcafc4d9e951c90d4e7a0aac081e234b27..ee1930e9677e10d94082e01500f6c782eda4e6f8 100644
--- a/docs/gst/gstreamer.types.in
+++ b/docs/gst/gstreamer.types.in
@@ -15,8 +15,8 @@ gst_element_factory_get_type
 gst_element_get_type
 gst_ghost_pad_get_type
 gst_implements_interface_get_type
-gst_index_factory_get_type
-gst_index_get_type
+@GST_INDEX_DOC_TYPES@gst_index_factory_get_type
+@GST_INDEX_DOC_TYPES@gst_index_get_type
 gst_registry_get_type
 
 % these are not GObject derived types !
diff --git a/gst/gstmessage.c b/gst/gstmessage.c
index a92da25a0fb57f3ea41f2940f30b760f33339c9c..81f0105fd56ee3e2651ffa25b67ce02bde28a7e9 100644
--- a/gst/gstmessage.c
+++ b/gst/gstmessage.c
@@ -757,6 +757,8 @@ gst_message_new_async_start (GstObject * src, gboolean new_base_time)
  * gst_message_new_async_done:
  * @src: The object originating the message.
  *
+ * The message is posted when elements completed an ASYNC state change.
+ *
  * Returns: The new async_done message.
  *
  * MT safe.
diff --git a/gst/gstparamspecs.h b/gst/gstparamspecs.h
index e4de9ad584305c875ee5c9f92f4ddfe564e2b103..d021d40d59972a94d555b1d2941fed3116feb144 100644
--- a/gst/gstparamspecs.h
+++ b/gst/gstparamspecs.h
@@ -40,6 +40,19 @@ GType  gst_param_spec_fraction_get_type (void);
 
 typedef struct _GstParamSpecFraction GstParamSpecFraction;
 
+/**
+ * GstParamSpecFraction:
+ * @parent_instance: super class
+ * @min_num: minimal numerator
+ * @min_den: minimal denominator
+ * @max_num: maximal numerator
+ * @max_den: maximal denominator
+ * @def_num: default numerator
+ * @def_den: default denominator
+ *
+ * A GParamSpec derived structure that contains the meta data for fractional
+ * properties.
+ */
 struct _GstParamSpecFraction {
   GParamSpec    parent_instance;
   
diff --git a/gst/gstregistrybinary.c b/gst/gstregistrybinary.c
index c36280f034bb33879de7ffdd00a11b4ea401718b..672c1f63353d0ac00719e0a278b24fb385741544 100644
--- a/gst/gstregistrybinary.c
+++ b/gst/gstregistrybinary.c
@@ -441,8 +441,12 @@ fail:
 
 /**
  * gst_registry_binary_write_cache:
+ * @registry: a #GstRegistry
+ * @location: a filename
  *
- * Write the cache to file. Part of the code was taken from gstregistryxml.c
+ * Write the @registry to a cache to file at given @location.
+ * 
+ * Returns: %TRUE on success.
  */
 gboolean
 gst_registry_binary_write_cache (GstRegistry * registry, const char *location)
diff --git a/gst/gstvalue.c b/gst/gstvalue.c
index aae464ad3da7383d3a2c6dec63c8f4b1abd16423..211d6a824e85118d7903a931096192c45ffd18f9 100644
--- a/gst/gstvalue.c
+++ b/gst/gstvalue.c
@@ -3146,18 +3146,6 @@ gst_value_register_subtract_func (GType minuend_type, GType subtrahend_type,
  * Registers functions to perform calculations on #GValues of a given
  * type.
  */
-/**
- * GstValueTable:
- * @type: GType that the functions operate on.
- * @compare: A function that compares two values of this type.
- * @serialize: A function that transforms a value of this type to a
- * string.  Strings created by this function must be unique and should
- * be human readable.
- * @deserialize: A function that transforms a string to a value of
- * this type.  This function must transform strings created by the
- * serialize function back to the original value.  This function may
- * optionally transform other strings into values.
- */
 void
 gst_value_register (const GstValueTable * table)
 {
diff --git a/gst/gstxml.h b/gst/gstxml.h
index 9650284fb278834769e72c1d0531fd85ebfd70bf..83043d5814b6109d6cc2a81000f401934708252a 100644
--- a/gst/gstxml.h
+++ b/gst/gstxml.h
@@ -43,17 +43,21 @@ typedef struct _GstXMLClass GstXMLClass;
 
 /**
  * GstXML:
+ * @object: parent object
+ * @topelements: list of element nodes
+ * @ns: name space
  *
  * XML parser object
  */
 struct _GstXML {
   GstObject object;
 
+  /*< public >*/
   GList      *topelements;
 
   xmlNsPtr ns;
 
-	/*< private >*/
+  /*< private >*/
   gpointer _gst_reserved[GST_PADDING];
 };