diff --git a/docs/gst/tmpl/gst.sgml b/docs/gst/tmpl/gst.sgml
index 0fd5a1d597..c6bf6a11db 100644
--- a/docs/gst/tmpl/gst.sgml
+++ b/docs/gst/tmpl/gst.sgml
@@ -71,7 +71,8 @@ fragment:
   to find the version at compile time.
 </para>
 <para>
-gst_main() and gst_main_quit() enter and exit the main loop. 
+gst_main() and gst_main_quit() enter and exit the main loop. GStreamer doesn't currently require
+you to us a mainloop but can intergrate with it without problems.
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
diff --git a/docs/gst/tmpl/gstbin.sgml b/docs/gst/tmpl/gstbin.sgml
index 637decacde..38a41423a8 100644
--- a/docs/gst/tmpl/gstbin.sgml
+++ b/docs/gst/tmpl/gstbin.sgml
@@ -43,6 +43,8 @@ gst_bin_destroy() is used to destroy the bin.
 To control the selection of the clock in a bin, you can use the following methods:
 gst_bin_auto_clock() to let the bin select a clock automatically, gst_bin_get_clock() to
 get the current clock of the bin and gst_bin_use_clock() to specify a clock explicitly.
+Note that the default behaviour is to automatically select a clock from one of the
+clock providers in the bin.
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -74,7 +76,7 @@ gst_bin_set_pre_iterate_function() and gst_bin_set_post_iterate_function().
 </para>
 
 @bin: The bin that performed the callback
-@data: user data
+@user_data: user data
 
 
 <!-- ##### FUNCTION gst_bin_new ##### -->
@@ -167,7 +169,7 @@ Free the memory allocated by this bin
 
 @bin: 
 @func: 
-@func_data: 
+@user_data: 
 
 
 <!-- ##### FUNCTION gst_bin_set_pre_iterate_function ##### -->
@@ -177,7 +179,7 @@ Free the memory allocated by this bin
 
 @bin: 
 @func: 
-@func_data: 
+@user_data: 
 
 
 <!-- ##### FUNCTION gst_bin_child_state_change ##### -->
@@ -217,12 +219,19 @@ Free the memory allocated by this bin
 @clock: 
 
 
-<!-- ##### SIGNAL GstBin::object-added ##### -->
+<!-- ##### SIGNAL GstBin::element-added ##### -->
 <para>
-is signaled whenever a new <classname>GstElement</classname> is added to the <classname>GstBin</classname>
 
 </para>
 
 @gstbin: the object which received the signal.
-@arg1: the element that was added
+@arg1: 
+
+<!-- ##### SIGNAL GstBin::element-removed ##### -->
+<para>
+
+</para>
+
+@gstbin: the object which received the signal.
+@arg1: 
 
diff --git a/docs/gst/tmpl/gstbuffer.sgml b/docs/gst/tmpl/gstbuffer.sgml
index 17a6908af0..1fa1bb74b3 100644
--- a/docs/gst/tmpl/gstbuffer.sgml
+++ b/docs/gst/tmpl/gstbuffer.sgml
@@ -374,7 +374,6 @@ Frees the given buffer, regardless of the refcount.
 It is dangerous to use this function, you should use gst_buffer_unref() instead.
 </para>
 
-@buf: 
 @buf: a #GstBuffer to free.
 
 
diff --git a/docs/gst/tmpl/gstreamer-unused.sgml b/docs/gst/tmpl/gstreamer-unused.sgml
index 89c070b656..53a9dec775 100644
--- a/docs/gst/tmpl/gstreamer-unused.sgml
+++ b/docs/gst/tmpl/gstreamer-unused.sgml
@@ -4124,6 +4124,15 @@ The frequency.
 @cost: 
 @endpoint: 
 
+<!-- ##### SIGNAL GstBin::object-added ##### -->
+<para>
+is signaled whenever a new <classname>GstElement</classname> is added to the <classname>GstBin</classname>
+
+</para>
+
+@gstbin: the object which received the signal.
+@arg1: the element that was added
+
 <!-- ##### STRUCT GstBinClass ##### -->
 <para>
 
diff --git a/docs/gst/tmpl/gstregistry.sgml b/docs/gst/tmpl/gstregistry.sgml
index 94730b6c6f..fc74b3da92 100644
--- a/docs/gst/tmpl/gstregistry.sgml
+++ b/docs/gst/tmpl/gstregistry.sgml
@@ -49,6 +49,7 @@ The registry object
 @loaded: 
 @plugins: 
 @paths: 
+@dummy: 
 
 <!-- ##### FUNCTION gst_registry_load ##### -->
 <para>
diff --git a/docs/gst/tmpl/gstxml.sgml b/docs/gst/tmpl/gstxml.sgml
index 32d00bc1f9..08450b21b9 100644
--- a/docs/gst/tmpl/gstxml.sgml
+++ b/docs/gst/tmpl/gstxml.sgml
@@ -110,6 +110,10 @@ All GstElements can be serialized to an XML presentation and subsequently loaded
 
 </para>
 
+@: 
+@: 
+@:
+
 @gstxml: the object which received the signal.
 @arg1: 
 @arg2: 
@@ -119,7 +123,7 @@ All GstElements can be serialized to an XML presentation and subsequently loaded
 
 </para>
 
-@: 
-@: 
-@: 
+@gstxml: the object which received the signal.
+@arg1: 
+@arg2: