diff --git a/docs/gst/gstreamer-docs.sgml b/docs/gst/gstreamer-docs.sgml
index 7f2bb8873e..37543faec7 100644
--- a/docs/gst/gstreamer-docs.sgml
+++ b/docs/gst/gstreamer-docs.sgml
@@ -63,16 +63,7 @@
   <bookinfo>
     <title>GStreamer Core Reference Manual</title>
   </bookinfo>
-  <chapter id="gstreamer-support">
-    <title>GStreamer Core Support</title>
-    <para>
-    </para>
 
-    &cothreads;
-    &GstAtomic;
-    &GstMemChunk;
-
-  </chapter>
   <chapter id="gstreamer">
     <title>GStreamer Core Library</title>
 
@@ -117,6 +108,18 @@ with some more specialized elements.</para>
 
   </chapter>
 
+  <chapter id="gstreamer-support">
+    <title>GStreamer Core Support</title>
+    <para>
+    </para>
+
+    &cothreads;
+    &GstAtomic;
+    &GstMemChunk;
+
+  </chapter>
+
+<!--
   <chapter id="element-types">
     <title>GStreamer Standard Elements</title>
 
@@ -126,7 +129,6 @@ with some more specialized elements.</para>
       g_object_set() functions and the GStreamer Core Library functions.
     </para>
 
-<!--
     &GstAggregator;
 
     &GstFakeSrc;
@@ -145,8 +147,8 @@ with some more specialized elements.</para>
     &GstMD5Sink;
 
     &GstTee;
-    -->
   </chapter>
+    -->
 
 <!--
   <chapter id="gst-index">
diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt
index 2aef9d26ff..3bfa9b0996 100644
--- a/docs/gst/gstreamer-sections.txt
+++ b/docs/gst/gstreamer-sections.txt
@@ -1,59 +1,4 @@
 <INCLUDE>gst/gst.h</INCLUDE>
-
-<SECTION>
-<FILE>cothreads</FILE>
-<TITLE>Cothreads</TITLE>
-cothread_state
-cothread_func
-cothread_context
-COTHREAD_STARTED
-COTHREAD_DESTROYED
-cothread_context_init
-cothread_context_free
-cothread_get_private
-cothread_set_private
-cothread_create
-cothread_free
-cothread_setfunc
-cothread_stop
-cothread_switch
-cothread_context_get_data
-cothread_context_set_data
-cothread_lock
-cothread_trylock
-cothread_unlock
-cothread_main
-cothread_current_main
-cothread_current
-
-<SUBSECTION Standard>
-</SECTION>
-
-<SECTION>
-<FILE>gstatomic</FILE>
-<TITLE>GstAtomic</TITLE>
-GstAtomicInt
-gst_atomic_int_init
-gst_atomic_int_destroy
-gst_atomic_int_set
-gst_atomic_int_read
-gst_atomic_int_add
-gst_atomic_int_inc
-gst_atomic_int_dec_and_test
-<SUBSECTION Standard>
-</SECTION>
-
-<SECTION>
-<FILE>gstmemchunk</FILE>
-<TITLE>GstMemChunk</TITLE>
-GstMemChunk
-gst_mem_chunk_new
-gst_mem_chunk_destroy
-gst_mem_chunk_alloc
-gst_mem_chunk_alloc0
-gst_mem_chunk_free
-</SECTION>
-
 <SECTION>
 <FILE>gst</FILE>
 <TITLE>Gst</TITLE>
@@ -1063,9 +1008,7 @@ GstPluginError
 GstPlugin
 GstPluginInitFunc
 GstPluginDesc
-gst_plugin_set_name
 gst_plugin_get_name
-gst_plugin_get_longname
 gst_plugin_get_filename
 gst_plugin_is_loaded
 gst_plugin_get_feature_list
@@ -1372,4 +1315,58 @@ GST_IS_INDEX_FACTORY
 GST_IS_INDEX_FACTORY_CLASS
 </SECTION>
 
+<SECTION>
+<FILE>cothreads</FILE>
+<TITLE>Cothreads</TITLE>
+cothread_state
+cothread_func
+cothread_context
+COTHREAD_STARTED
+COTHREAD_DESTROYED
+cothread_context_init
+cothread_context_free
+cothread_get_private
+cothread_set_private
+cothread_create
+cothread_free
+cothread_setfunc
+cothread_stop
+cothread_switch
+cothread_context_get_data
+cothread_context_set_data
+cothread_lock
+cothread_trylock
+cothread_unlock
+cothread_main
+cothread_current_main
+cothread_current
+
+<SUBSECTION Standard>
+</SECTION>
+
+<SECTION>
+<FILE>gstatomic</FILE>
+<TITLE>GstAtomic</TITLE>
+GstAtomicInt
+gst_atomic_int_init
+gst_atomic_int_destroy
+gst_atomic_int_set
+gst_atomic_int_read
+gst_atomic_int_add
+gst_atomic_int_inc
+gst_atomic_int_dec_and_test
+<SUBSECTION Standard>
+</SECTION>
+
+<SECTION>
+<FILE>gstmemchunk</FILE>
+<TITLE>GstMemChunk</TITLE>
+GstMemChunk
+gst_mem_chunk_new
+gst_mem_chunk_destroy
+gst_mem_chunk_alloc
+gst_mem_chunk_alloc0
+gst_mem_chunk_free
+</SECTION>
+
 
diff --git a/docs/gst/tmpl/gstelement.sgml b/docs/gst/tmpl/gstelement.sgml
index f8dddde265..eab2e682e2 100644
--- a/docs/gst/tmpl/gstelement.sgml
+++ b/docs/gst/tmpl/gstelement.sgml
@@ -992,6 +992,9 @@ Is triggered whenever an error occured.
 @:
 @:
 @:
+@:
+@:
+@:
 @: 
 
 <!-- ##### SIGNAL GstElement::found-tag ##### -->
diff --git a/docs/gst/tmpl/gstxml.sgml b/docs/gst/tmpl/gstxml.sgml
index 08450b21b9..32d00bc1f9 100644
--- a/docs/gst/tmpl/gstxml.sgml
+++ b/docs/gst/tmpl/gstxml.sgml
@@ -110,10 +110,6 @@ All GstElements can be serialized to an XML presentation and subsequently loaded
 
 </para>
 
-@: 
-@: 
-@:
-
 @gstxml: the object which received the signal.
 @arg1: 
 @arg2: 
@@ -123,7 +119,7 @@ All GstElements can be serialized to an XML presentation and subsequently loaded
 
 </para>
 
-@gstxml: the object which received the signal.
-@arg1: 
-@arg2: 
+@: 
+@: 
+@: