diff --git a/docs/gst/gstreamer.types b/docs/gst/gstreamer.types
index 6e9544c1b0..f7affae07b 100644
--- a/docs/gst/gstreamer.types
+++ b/docs/gst/gstreamer.types
@@ -18,7 +18,6 @@ gst_queue_get_type
 gst_scheduler_factory_get_type
 gst_scheduler_get_type
 gst_tag_setter_get_type
-gst_thread_get_type
 gst_type_find_factory_get_type
 gst_xml_get_type
 
diff --git a/docs/gst/tmpl/gstbin.sgml b/docs/gst/tmpl/gstbin.sgml
index 2b29fb1b9a..2b5523414f 100644
--- a/docs/gst/tmpl/gstbin.sgml
+++ b/docs/gst/tmpl/gstbin.sgml
@@ -60,6 +60,9 @@ clock providers in the bin.
 
 </para>
 
+@numchildren: 
+@children: 
+@children_cookie: 
 
 <!-- ##### SIGNAL GstBin::element-added ##### -->
 <para>
@@ -77,26 +80,11 @@ Will be emmited if an element was removed from this bin.
 @gstbin: the object which received the signal.
 @arg1: the element that was removed from the bin
 
-<!-- ##### SIGNAL GstBin::iterate ##### -->
-<para>
-This signal is emitted when a bin iterates, either automatically or
-due to a #gst_bin_iterate() call.  The return value is used to
-determine if the object method handler processed any data.
-In most normal cases, a user-provided signal handler should return
-FALSE.
-</para>
-
-@gstbin: the object which received the signal.
-@Returns: TRUE if the state of the bin was advanced.
-
 <!-- ##### ENUM GstBinFlags ##### -->
 <para>
 Flags for a bin.
 </para>
 
-@GST_BIN_FLAG_MANAGER: This bin has a scheduler and can be used as a toplevel bin.
-@GST_BIN_SELF_SCHEDULABLE: This bin iterates itself, so no calls to gst_bin_iterate() should be made.
-@GST_BIN_FLAG_PREFER_COTHREADS: This bin preferes to have its elements scheduled with cothreads
 @GST_BIN_FLAG_FIXED_CLOCK: This bin uses a fixed clock, possibly the one set with gst_bin_use_clock().
 @GST_BIN_FLAG_LAST: 
 
@@ -116,6 +104,7 @@ Flags for a bin.
 
 @bin: 
 @element: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gst_bin_add_many ##### -->
@@ -135,6 +124,7 @@ Flags for a bin.
 
 @bin: 
 @element: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gst_bin_remove_many ##### -->
@@ -167,15 +157,6 @@ Flags for a bin.
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_bin_get_list ##### -->
-<para>
-
-</para>
-
-@bin: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_bin_get_by_interface ##### -->
 <para>
 
@@ -186,68 +167,3 @@ Flags for a bin.
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_bin_get_all_by_interface ##### -->
-<para>
-
-</para>
-
-@bin: 
-@interface: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_bin_iterate ##### -->
-<para>
-
-</para>
-
-@bin: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_bin_use_clock ##### -->
-<para>
-
-</para>
-
-@bin: 
-@clock: 
-
-
-<!-- ##### FUNCTION gst_bin_get_clock ##### -->
-<para>
-
-</para>
-
-@bin: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_bin_auto_clock ##### -->
-<para>
-
-</para>
-
-@bin: 
-
-
-<!-- ##### FUNCTION gst_bin_sync_children_state ##### -->
-<para>
-
-</para>
-
-@bin: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_bin_child_state_change ##### -->
-<para>
-
-</para>
-
-@bin: 
-@oldstate: 
-@newstate: 
-@child: 
-
-
diff --git a/docs/gst/tmpl/gstbuffer.sgml b/docs/gst/tmpl/gstbuffer.sgml
index ff23335740..7d9fa0c0f3 100644
--- a/docs/gst/tmpl/gstbuffer.sgml
+++ b/docs/gst/tmpl/gstbuffer.sgml
@@ -95,11 +95,9 @@ The basic structure of a buffer.
 @maxsize: 
 @timestamp: 
 @duration: 
+@caps: 
 @offset: 
 @offset_end: 
-@free_data: 
-@buffer_private: 
-@_gst_reserved: 
 
 <!-- ##### FUNCTION gst_buffer_new ##### -->
 <para>
@@ -127,9 +125,10 @@ The basic structure of a buffer.
 @GST_BUFFER_SUBBUFFER: 
 @GST_BUFFER_ORIGINAL: 
 @GST_BUFFER_DONTFREE: 
-@GST_BUFFER_KEY_UNIT: 
-@GST_BUFFER_DONTKEEP: 
+@GST_BUFFER_PREROLL: 
+@GST_BUFFER_DISCONT: 
 @GST_BUFFER_IN_CAPS: 
+@GST_BUFFER_GAP: 
 @GST_BUFFER_DELTA_UNIT: 
 @GST_BUFFER_FLAG_LAST: 
 
@@ -262,15 +261,6 @@ will be freed.
 @buf: a #GstBuffer to unref.
 
 
-<!-- ##### FUNCTION gst_buffer_stamp ##### -->
-<para>
-
-</para>
-
-@dest: 
-@src: 
-
-
 <!-- ##### MACRO gst_buffer_copy ##### -->
 <para>
 Copies the given buffer using the copy function of the parent GstData structure.
@@ -311,16 +301,6 @@ If the refcount is 1, this function just returns the original buffer.
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_buffer_join ##### -->
-<para>
-
-</para>
-
-@buf1: 
-@buf2: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_buffer_merge ##### -->
 <para>
 
@@ -349,6 +329,13 @@ If the refcount is 1, this function just returns the original buffer.
 </para>
 
 <<<<<<< gstbuffer.sgml
+
+@buf1: 
+@buf2: 
+@Returns: 
+
+>>>>>>> 1.48
+<!-- # Unused Parameters # -->
 @GST_BUFFER_READONLY: the buffer is read-only.
 @GST_BUFFER_SUBBUFFER: the buffer is a subbuffer, the parent buffer can be 
                        found with the GST_BUFFER_POOL_PRIVATE() macro.
@@ -365,11 +352,7 @@ If the refcount is 1, this function just returns the original buffer.
 >>>>>>> 1.44
 @GST_BUFFER_FLAG_LAST: additional flags can be added starting from this flag.
 =======
-@buf1: 
-@buf2: 
-@Returns: 
 
->>>>>>> 1.48
 
 <!-- ##### FUNCTION gst_buffer_default_free ##### -->
 <para>
diff --git a/docs/gst/tmpl/gstcaps.sgml b/docs/gst/tmpl/gstcaps.sgml
index 39812d240e..6b3177c50d 100644
--- a/docs/gst/tmpl/gstcaps.sgml
+++ b/docs/gst/tmpl/gstcaps.sgml
@@ -97,9 +97,9 @@ templates.
 </para>
 
 @type: 
+@refcount: 
 @flags: 
 @structs: 
-@_gst_reserved: 
 
 <!-- ##### STRUCT GstStaticCaps ##### -->
 <para>
@@ -108,7 +108,6 @@ templates.
 
 @caps: 
 @string: 
-@_gst_reserved: 
 
 <!-- ##### FUNCTION gst_caps_new_empty ##### -->
 <para>
@@ -166,14 +165,6 @@ templates.
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_caps_free ##### -->
-<para>
-
-</para>
-
-@caps: 
-
-
 <!-- ##### FUNCTION gst_static_caps_get ##### -->
 <para>
 
@@ -205,15 +196,6 @@ templates.
 @caps1: 
 
 
-<!-- ##### FUNCTION gst_caps_split_one ##### -->
-<para>
-
-</para>
-
-@caps: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_caps_get_size ##### -->
 <para>
 
@@ -280,15 +262,6 @@ templates.
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_caps_is_chained ##### -->
-<para>
-
-</para>
-
-@caps: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_caps_is_fixed ##### -->
 <para>
 
@@ -308,16 +281,6 @@ templates.
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_caps_is_equal_fixed ##### -->
-<para>
-
-</para>
-
-@caps1: 
-@caps2: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_caps_is_always_compatible ##### -->
 <para>
 
@@ -367,15 +330,6 @@ templates.
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_caps_simplify ##### -->
-<para>
-
-</para>
-
-@caps: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_caps_do_simplify ##### -->
 <para>
 
diff --git a/docs/gst/tmpl/gstclock.sgml b/docs/gst/tmpl/gstclock.sgml
index fb652d2d67..c5ca06eec0 100644
--- a/docs/gst/tmpl/gstclock.sgml
+++ b/docs/gst/tmpl/gstclock.sgml
@@ -26,6 +26,7 @@ clock so that the clock is always a good measure of the time in the pipeline.
 
 </para>
 
+@flags: 
 
 <!-- ##### ARG GstClock:event-diff ##### -->
 <para>
@@ -142,13 +143,6 @@ All pending timeouts or periodic notifies are converted into
 an entry.
 </para>
 
-@clock: 
-@type: 
-@time: 
-@interval: 
-@status: 
-@func: 
-@user_data: 
 
 <!-- ##### USER_FUNCTION GstClockCallback ##### -->
 <para>
@@ -232,11 +226,12 @@ The status of the entry
 The return value of a clock operation.
 </para>
 
-@GST_CLOCK_STOPPED: The clock is stopped.
+@GST_CLOCK_UNSCHEDULED: 
 @GST_CLOCK_TIMEOUT: The operation timed out.
 @GST_CLOCK_EARLY: The operation was scheduled too late.
 @GST_CLOCK_ERROR: An error occured
 @GST_CLOCK_UNSUPPORTED: Operation is not supported
+@GST_CLOCK_OK: 
 
 <!-- ##### ENUM GstClockFlags ##### -->
 <para>
@@ -258,25 +253,6 @@ Get the clock flags
 @clock: the clock to query
 
 
-<!-- ##### FUNCTION gst_clock_set_speed ##### -->
-<para>
-
-</para>
-
-@clock: 
-@speed: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_clock_get_speed ##### -->
-<para>
-
-</para>
-
-@clock: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_clock_set_resolution ##### -->
 <para>
 
@@ -296,42 +272,6 @@ Get the clock flags
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_clock_set_active ##### -->
-<para>
-
-</para>
-
-@clock: 
-@active: 
-
-
-<!-- ##### FUNCTION gst_clock_is_active ##### -->
-<para>
-
-</para>
-
-@clock: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_clock_reset ##### -->
-<para>
-
-</para>
-
-@clock: 
-
-
-<!-- ##### FUNCTION gst_clock_handle_discont ##### -->
-<para>
-
-</para>
-
-@clock: 
-@time: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_clock_get_time ##### -->
 <para>
 
@@ -341,25 +281,6 @@ Get the clock flags
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_clock_get_event_time ##### -->
-<para>
-
-</para>
-
-@clock: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_clock_get_event_time_delay ##### -->
-<para>
-
-</para>
-
-@clock: 
-@delay: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_clock_get_next_id ##### -->
 <para>
 
diff --git a/docs/gst/tmpl/gstdata.sgml b/docs/gst/tmpl/gstdata.sgml
index d7e2c65d5e..31181f6db5 100644
--- a/docs/gst/tmpl/gstdata.sgml
+++ b/docs/gst/tmpl/gstdata.sgml
@@ -65,9 +65,6 @@ The base structure
 @type: The type of this data.
 @refcount: A refcount
 @flags: The flags of this GstData
-@free: A pointer to a custom free function
-@copy: A pointer to a custom copy function
-@_gst_reserved: 
 
 <!-- ##### USER_FUNCTION GstDataFreeFunction ##### -->
 <para>
diff --git a/docs/gst/tmpl/gstelement.sgml b/docs/gst/tmpl/gstelement.sgml
index 1a1dd83678..579b04e4f0 100644
--- a/docs/gst/tmpl/gstelement.sgml
+++ b/docs/gst/tmpl/gstelement.sgml
@@ -70,43 +70,23 @@ and gst_element_set_clock().  You can wait for the clock to reach a given
 
 </para>
 
-
-<!-- ##### SIGNAL GstElement::eos ##### -->
-<para>
-
-</para>
-
-@:
-
-@gstelement: the object which received the signal.
-
-<!-- ##### SIGNAL GstElement::error ##### -->
-<para>
-
-</para>
-
-@: 
-@: 
-@: 
-@:
-
-@gstelement: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-
-<!-- ##### SIGNAL GstElement::found-tag ##### -->
-<para>
-
-</para>
-
-@: 
-@: 
-@:
-
-@gstelement: the object which received the signal.
-@arg1: 
-@arg2: 
+@state_lock: 
+@state_cond: 
+@current_state: 
+@pending_state: 
+@manager: 
+@bus: 
+@scheduler: 
+@sched_private: 
+@clock: 
+@base_time: 
+@numpads: 
+@pads: 
+@numsrcpads: 
+@srcpads: 
+@numsinkpads: 
+@sinkpads: 
+@pads_cookie: 
 
 <!-- ##### SIGNAL GstElement::new-pad ##### -->
 <para>
@@ -257,43 +237,11 @@ A helper macro to create a mask function
 This enum defines the standard flags that an element may have.
 </para>
 
-@GST_ELEMENT_COMPLEX: 
-@GST_ELEMENT_DECOUPLED: 
-@GST_ELEMENT_THREAD_SUGGESTED: 
-@GST_ELEMENT_INFINITE_LOOP: 
-@GST_ELEMENT_NEW_LOOPFUNC: 
-@GST_ELEMENT_EVENT_AWARE: 
-@GST_ELEMENT_USE_THREADSAFE_PROPERTIES: 
 @GST_ELEMENT_SCHEDULER_PRIVATE1: 
 @GST_ELEMENT_SCHEDULER_PRIVATE2: 
 @GST_ELEMENT_LOCKED_STATE: 
-@GST_ELEMENT_IN_ERROR: 
 @GST_ELEMENT_FLAG_LAST: 
 
-<!-- ##### MACRO GST_ELEMENT_IS_THREAD_SUGGESTED ##### -->
-<para>
-Queries whether the Element should be placed in a thread.
-</para>
-
-@obj: a #GstElement to query
-
-
-<!-- ##### MACRO GST_ELEMENT_IS_EVENT_AWARE ##### -->
-<para>
-Query wether this element can handle events.
-</para>
-
-@obj: a #GstElement to query
-
-
-<!-- ##### MACRO GST_ELEMENT_IS_DECOUPLED ##### -->
-<para>
-Queries if the Element is decoupled.
-</para>
-
-@obj: a #GstElement to query
-
-
 <!-- ##### MACRO GST_ELEMENT_NAME ##### -->
 <para>
 Gets the name of this element.  Used in the core.  Not ABI-compatible.
@@ -310,14 +258,6 @@ Get the parent object of this element.
 @obj: a #GstElement to query
 
 
-<!-- ##### MACRO GST_ELEMENT_SCHED ##### -->
-<para>
-Get the scheduler of this element.
-</para>
-
-@obj: a #GstElement to query
-
-
 <!-- ##### MACRO GST_ELEMENT_CLOCK ##### -->
 <para>
 Get the clock of this element
@@ -344,36 +284,10 @@ application will be requested to stop further media processing.
 @el: the element that throws the error
 @domain: 
 @code: 
-@message: the message to display
+@text: 
 @debug: 
-
-
-<!-- ##### USER_FUNCTION GstElementLoopFunction ##### -->
-<para>
-This function type is used to specify a loop function for the element.  It
-is passed the element in question, and is expect to return only in error
-circumstances.
-</para>
-
-@element: The element in question.
-
-
-<!-- ##### USER_FUNCTION GstElementPreRunFunction ##### -->
-<para>
-The signature of the function to execute after this element
-is scheduled.
-</para>
-
-@element: The element
-
-
-<!-- ##### USER_FUNCTION GstElementPostRunFunction ##### -->
-<para>
-The signature of the function to execute before this element
-is scheduled.
-</para>
-
-@element: The element
+<!-- # Unused Parameters # -->
+@message: the message to display
 
 
 <!-- ##### FUNCTION gst_element_class_add_pad_template ##### -->
@@ -404,34 +318,6 @@ is scheduled.
 @details: 
 
 
-<!-- ##### MACRO gst_element_default_deep_notify ##### -->
-<para>
-The default deep notify handler that prints out the property change
-notifications to stdout.
-</para>
-
-
-
-<!-- ##### FUNCTION gst_element_default_error ##### -->
-<para>
-
-</para>
-
-@object: 
-@orig: 
-@error: 
-@debug: 
-
-
-<!-- ##### FUNCTION gst_element_set_loop_function ##### -->
-<para>
-
-</para>
-
-@element: 
-@loop: 
-
-
 <!-- ##### MACRO gst_element_get_name ##### -->
 <para>
 Gets the name of the element.
@@ -471,90 +357,6 @@ Sets the parent of an element.
 @parent:  the new #GstObject parent of the object.
 
 
-<!-- ##### FUNCTION gst_element_set ##### -->
-<para>
-
-</para>
-
-@element: 
-@first_property_name: 
-@Varargs: 
-
-
-<!-- ##### FUNCTION gst_element_get ##### -->
-<para>
-
-</para>
-
-@element: 
-@first_property_name: 
-@Varargs: 
-
-
-<!-- ##### FUNCTION gst_element_set_valist ##### -->
-<para>
-
-</para>
-
-@element: 
-@first_property_name: 
-@var_args: 
-
-
-<!-- ##### FUNCTION gst_element_get_valist ##### -->
-<para>
-
-</para>
-
-@element: 
-@first_property_name: 
-@var_args: 
-
-
-<!-- ##### FUNCTION gst_element_set_property ##### -->
-<para>
-
-</para>
-
-@element: 
-@property_name: 
-@value: 
-
-
-<!-- ##### FUNCTION gst_element_get_property ##### -->
-<para>
-
-</para>
-
-@element: 
-@property_name: 
-@value: 
-
-
-<!-- ##### FUNCTION gst_element_enable_threadsafe_properties ##### -->
-<para>
-
-</para>
-
-@element: 
-
-
-<!-- ##### FUNCTION gst_element_disable_threadsafe_properties ##### -->
-<para>
-
-</para>
-
-@element: 
-
-
-<!-- ##### FUNCTION gst_element_set_pending_properties ##### -->
-<para>
-
-</para>
-
-@element: 
-
-
 <!-- ##### FUNCTION gst_element_requires_clock ##### -->
 <para>
 
@@ -624,34 +426,6 @@ Sets the parent of an element.
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_element_set_time ##### -->
-<para>
-
-</para>
-
-@element: 
-@time: 
-
-
-<!-- ##### FUNCTION gst_element_set_time_delay ##### -->
-<para>
-
-</para>
-
-@element: 
-@time: 
-@delay: 
-
-
-<!-- ##### FUNCTION gst_element_adjust_time ##### -->
-<para>
-
-</para>
-
-@element: 
-@diff: 
-
-
 <!-- ##### FUNCTION gst_element_is_indexable ##### -->
 <para>
 
@@ -679,38 +453,14 @@ Sets the parent of an element.
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_element_release_locks ##### -->
-<para>
-
-</para>
-
-@element: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_element_yield ##### -->
-<para>
-
-</para>
-
-@element: 
-
-
-<!-- ##### FUNCTION gst_element_interrupt ##### -->
-<para>
-
-</para>
-
-@element: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_element_set_scheduler ##### -->
 <para>
 
 </para>
 
 @element: 
+@scheduler: 
+<!-- # Unused Parameters # -->
 @sched: 
 
 
@@ -730,6 +480,7 @@ Sets the parent of an element.
 
 @element: 
 @pad: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gst_element_remove_pad ##### -->
@@ -739,6 +490,7 @@ Sets the parent of an element.
 
 @element: 
 @pad: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gst_element_add_ghost_pad ##### -->
@@ -752,18 +504,6 @@ Sets the parent of an element.
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_element_remove_ghost_pad ##### -->
-<para>
-
-</para>
-
-@element: 
-@pad: 
-
-
-<!-- pad template manipulation -->
-
-
 <!-- ##### FUNCTION gst_element_get_pad ##### -->
 <para>
 
@@ -803,15 +543,6 @@ Sets the parent of an element.
 @pad: 
 
 
-<!-- ##### FUNCTION gst_element_get_pad_list ##### -->
-<para>
-
-</para>
-
-@element: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_element_get_compatible_pad ##### -->
 <para>
 
@@ -852,29 +583,6 @@ Sets the parent of an element.
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_element_get_pad_template ##### -->
-<para>
-
-</para>
-
-@element: 
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_element_get_pad_template_list ##### -->
-<para>
-
-</para>
-
-@element: 
-@Returns: 
-
-
-
-<!-- scheduling -->
-
-
 <!-- ##### FUNCTION gst_element_get_compatible_pad_template ##### -->
 <para>
 
@@ -1048,49 +756,6 @@ Sets the parent of an element.
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_element_found_tags ##### -->
-<para>
-
-</para>
-
-@element: 
-@tag_list: 
-
-
-<!-- ##### FUNCTION gst_element_found_tags_for_pad ##### -->
-<para>
-
-</para>
-
-@element: 
-@pad: 
-@timestamp: 
-@list: 
-
-
-<!-- ##### FUNCTION gst_element_set_eos ##### -->
-<para>
-
-</para>
-
-@element: 
-
-
-<!-- ##### FUNCTION gst_element_error_full ##### -->
-<para>
-
-</para>
-
-@element: 
-@domain: 
-@code: 
-@message: 
-@debug: 
-@file: 
-@function: 
-@line: 
-
-
 <!-- ##### FUNCTION gst_element_is_locked_state ##### -->
 <para>
 
@@ -1107,6 +772,7 @@ Sets the parent of an element.
 
 @element: 
 @locked_state: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gst_element_sync_state_with_parent ##### -->
@@ -1124,6 +790,9 @@ Sets the parent of an element.
 </para>
 
 @element: 
+@state: 
+@pending: 
+@timeout: 
 @Returns: 
 
 
@@ -1137,14 +806,6 @@ Sets the parent of an element.
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_element_wait_state_change ##### -->
-<para>
-
-</para>
-
-@element: 
-
-
 <!-- ##### FUNCTION gst_element_state_get_name ##### -->
 <para>
 
@@ -1163,17 +824,6 @@ Sets the parent of an element.
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_element_get_managing_bin ##### -->
-<para>
-
-</para>
-
-@element: 
-@Returns: 
-
-<!-- clocking -->
-
-
 <!-- ##### FUNCTION gst_element_no_more_pads ##### -->
 <para>
 
diff --git a/docs/gst/tmpl/gstelementdetails.sgml b/docs/gst/tmpl/gstelementdetails.sgml
index 0a6856e6f4..8c57fce9b1 100644
--- a/docs/gst/tmpl/gstelementdetails.sgml
+++ b/docs/gst/tmpl/gstelementdetails.sgml
@@ -24,5 +24,4 @@ describes the element, mostly for the benefit of editors.
 @klass: 
 @description: 
 @author: 
-@_gst_reserved: 
 
diff --git a/docs/gst/tmpl/gstelementfactory.sgml b/docs/gst/tmpl/gstelementfactory.sgml
index aac5b9f99e..d9b887df26 100644
--- a/docs/gst/tmpl/gstelementfactory.sgml
+++ b/docs/gst/tmpl/gstelementfactory.sgml
@@ -184,23 +184,3 @@ so that the autopluggers can select a plugin more appropriatly
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_element_factory_can_src_caps ##### -->
-<para>
-
-</para>
-
-@factory: 
-@caps: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_element_factory_can_sink_caps ##### -->
-<para>
-
-</para>
-
-@factory: 
-@caps: 
-@Returns: 
-
-
diff --git a/docs/gst/tmpl/gsterror.sgml b/docs/gst/tmpl/gsterror.sgml
index 9fa9b39de2..e03900acc6 100644
--- a/docs/gst/tmpl/gsterror.sgml
+++ b/docs/gst/tmpl/gsterror.sgml
@@ -123,16 +123,6 @@ Generates an human readable error message out of an errno number.
 
 
 
-<!-- ##### FUNCTION gst_error_get_message ##### -->
-<para>
-
-</para>
-
-@domain: 
-@code: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_stream_error_quark ##### -->
 <para>
 
diff --git a/docs/gst/tmpl/gstevent.sgml b/docs/gst/tmpl/gstevent.sgml
index 953aaa6e51..6e6833c8c0 100644
--- a/docs/gst/tmpl/gstevent.sgml
+++ b/docs/gst/tmpl/gstevent.sgml
@@ -45,7 +45,6 @@ The different major types of events.
 @GST_EVENT_UNKNOWN: unknown event.
 @GST_EVENT_EOS: an end-of-stream event.
 @GST_EVENT_FLUSH: a flush event.
-@GST_EVENT_EMPTY: an empty event.
 @GST_EVENT_DISCONTINUOUS: a discontinuous event to indicate the stream has a discontinuity.
 @GST_EVENT_QOS: a quality of service event
 @GST_EVENT_SEEK: a seek event.
@@ -53,20 +52,9 @@ The different major types of events.
 @GST_EVENT_SEGMENT_DONE: the event that will be emited when the segment seek has ended
 @GST_EVENT_SIZE: a size suggestion for a peer element
 @GST_EVENT_RATE: adjust the output rate of an element
-@GST_EVENT_FILLER: a dummy event that should be ignored by plugins
-@GST_EVENT_TS_OFFSET: an event to set the time offset on buffers
-@GST_EVENT_INTERRUPT: mainly used by _get based elements when they were interrupted
-                      while waiting for a buffer.
 @GST_EVENT_NAVIGATION: 
 @GST_EVENT_TAG: 
 
-<!-- ##### MACRO GST_EVENT_ANY ##### -->
-<para>
-
-</para>
-
-
-
 <!-- ##### MACRO GST_EVENT_TRACE_NAME ##### -->
 <para>
 The name used for memory allocation tracing
@@ -267,15 +255,6 @@ Indicates how accurate the event was performed.
 @event: The event to query
 
 
-<!-- ##### MACRO GST_EVENT_DISCONT_NEW_MEDIA ##### -->
-<para>
-Flag that indicates the discont event was because of a new media
-type.
-</para>
-
-@event: The event to operate on
-
-
 <!-- ##### MACRO GST_EVENT_DISCONT_OFFSET ##### -->
 <para>
 The offset of the discont event. A discont event can hold up to 8 different
@@ -407,10 +386,12 @@ Copy the event using the event specific copy function
 
 </para>
 
-@new_media: 
+@rate: 
 @format1: 
 @Varargs: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@new_media: 
 
 
 <!-- ##### FUNCTION gst_event_new_discontinuous_valist ##### -->
@@ -418,10 +399,12 @@ Copy the event using the event specific copy function
 
 </para>
 
-@new_media: 
+@rate: 
 @format1: 
 @var_args: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@new_media: 
 
 
 <!-- ##### FUNCTION gst_event_discont_get_value ##### -->
@@ -431,8 +414,11 @@ Copy the event using the event specific copy function
 
 @event: 
 @format: 
-@value: 
+@start_value: 
+@end_value: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@value: 
 
 
 <!-- ##### MACRO gst_event_new_filler ##### -->
@@ -442,10 +428,12 @@ Create a new dummy event that should be ignored
 
 
 
-<!-- ##### MACRO gst_event_new_flush ##### -->
+<!-- ##### FUNCTION gst_event_new_flush ##### -->
 <para>
 Create a new flush event.
 </para>
 
+@done: 
+@Returns: 
 
 
diff --git a/docs/gst/tmpl/gstobject.sgml b/docs/gst/tmpl/gstobject.sgml
index 2c60d982a4..16fb2d863a 100644
--- a/docs/gst/tmpl/gstobject.sgml
+++ b/docs/gst/tmpl/gstobject.sgml
@@ -72,6 +72,12 @@ object.
 
 </para>
 
+@refcount: 
+@lock: 
+@name: 
+@parent: 
+@flags: 
+@name_prefix: 
 
 <!-- ##### SIGNAL GstObject::deep-notify ##### -->
 <para>
@@ -119,8 +125,9 @@ The name of the object
 Flags for an object
 </para>
 
-@GST_DESTROYED: The object is flagged for destruction
-@GST_FLOATING: The object is created but has no parent yet to manage it
+@GST_OBJECT_DISPOSING: 
+@GST_OBJECT_DESTROYED: 
+@GST_OBJECT_FLOATING: 
 @GST_OBJECT_FLAG_LAST: subclasses can add additional flags starting from this flag
 
 <!-- ##### MACRO GST_FLAGS ##### -->
@@ -174,22 +181,6 @@ Get the parent of this object
 @obj: Object to get the parent of.
 
 
-<!-- ##### MACRO GST_OBJECT_DESTROYED ##### -->
-<para>
-Check if the object has been destroyed.
-</para>
-
-@obj: The Object to check
-
-
-<!-- ##### MACRO GST_OBJECT_FLOATING ##### -->
-<para>
-Check if the object is floating.
-</para>
-
-@obj: The Object to check
-
-
 <!-- ##### MACRO GST_LOCK ##### -->
 <para>
 This macro will obtain a lock on the object, making serialization
@@ -230,6 +221,9 @@ Acquire a reference to the mutex of this object.
 </para>
 
 @object: 
+@name_prefix: 
+@Returns: 
+<!-- # Unused Parameters # -->
 @name: 
 
 
@@ -249,6 +243,7 @@ Acquire a reference to the mutex of this object.
 
 @object: 
 @parent: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gst_object_get_parent ##### -->
@@ -323,6 +318,7 @@ Acquire a reference to the mutex of this object.
 </para>
 
 @object: the object
+@Returns: 
 
 
 <!-- ##### FUNCTION gst_object_sink ##### -->
diff --git a/docs/gst/tmpl/gstpad.sgml b/docs/gst/tmpl/gstpad.sgml
index c386b91fb6..e532f19a5b 100644
--- a/docs/gst/tmpl/gstpad.sgml
+++ b/docs/gst/tmpl/gstpad.sgml
@@ -74,12 +74,12 @@ Last reviewed on December 13th, 2002 (0.5.0.1)
 The result of a pad link.
 </para>
 
+@GST_PAD_LINK_NOSCHED: 
+@GST_PAD_LINK_NOFORMAT: 
 @GST_PAD_LINK_REFUSED: the link was refused.
-@GST_PAD_LINK_DELAYED: the link was delayed, probably because the
-                       element needs more specific pad capabilitiess.
+@GST_PAD_LINK_WRONG_DIRECTION: 
+@GST_PAD_LINK_WAS_LINKED: 
 @GST_PAD_LINK_OK:      the link succeeded.
-@GST_PAD_LINK_DONE:    the link succeeded, 
-                       any more attempts are not needed.
 
 <!-- ##### MACRO GST_PAD_LINK_FAILED ##### -->
 <para>
@@ -134,20 +134,13 @@ A function that will be called when chaining buffers.
 </para>
 
 @pad: the #GstPad that performed the chain.
-@data: 
+@buffer: 
+@Returns: 
 <!-- # Unused Parameters # -->
+@data: 
 @buf: the #GstBuffer that is chained.
 
 
-<!-- ##### USER_FUNCTION GstPadGetFunction ##### -->
-<para>
-A function that will be called when pulling a buffer.
-</para>
-
-@pad: the #GstPad to get a buffer from.
-@Returns: the #GstBuffer pulled.
-
-
 <!-- ##### USER_FUNCTION GstPadEventFunction ##### -->
 <para>
 Function signature to handle an event for the pad.
@@ -227,8 +220,10 @@ Function signature to handle a new link on the pad.
 </para>
 
 @pad: the #GstPad that is linked.
-@caps: the peer's #GstCaps.
+@peer: 
 @Returns: the result of the link with the specified caps.
+<!-- # Unused Parameters # -->
+@caps: the peer's #GstCaps.
 
 
 <!-- ##### USER_FUNCTION GstPadUnlinkFunction ##### -->
@@ -252,16 +247,6 @@ be overridden.
 @caps: the peer's #GstCaps, can be used to filter the capabilities.
 
 
-<!-- ##### USER_FUNCTION GstPadFixateFunction ##### -->
-<para>
-
-</para>
-
-@pad: 
-@caps: 
-@Returns: 
-
-
 <!-- ##### USER_FUNCTION GstPadBufferAllocFunction ##### -->
 <para>
 
@@ -270,6 +255,7 @@ be overridden.
 @pad: 
 @offset: 
 @size: 
+@caps: 
 @Returns: 
 
 
@@ -298,9 +284,11 @@ The direction of a pad.
 Flags for the pad.
 </para>
 
-@GST_PAD_DISABLED: the pad is disabled.
-@GST_PAD_NEGOTIATING: 
-@GST_PAD_DISPATCHING: 
+@GST_PAD_ACTIVE: 
+@GST_PAD_BLOCKED: 
+@GST_PAD_FLUSHING: 
+@GST_PAD_IN_GETCAPS: 
+@GST_PAD_IN_SETCAPS: 
 @GST_PAD_FLAG_LAST: subclasses can use this number to enumerate their flags.
 
 <!-- ##### MACRO GST_PAD_NAME ##### -->
@@ -401,14 +389,6 @@ Checks if the pad is active.
 @pad: 
 
 
-<!-- ##### MACRO GST_PAD_IS_DISPATCHING ##### -->
-<para>
-
-</para>
-
-@pad: 
-
-
 <!-- ##### MACRO GST_PAD_IS_USABLE ##### -->
 <para>
 Checks if a pad is usable. A usable pad is both linked and active.
@@ -493,7 +473,7 @@ gst_element_request_pad_by_name() or gst_element_request_compatible_pad().
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_pad_set_name ##### -->
+<!-- ##### MACRO gst_pad_set_name ##### -->
 <para>
 
 </para>
@@ -502,7 +482,7 @@ gst_element_request_pad_by_name() or gst_element_request_compatible_pad().
 @name: 
 
 
-<!-- ##### FUNCTION gst_pad_get_name ##### -->
+<!-- ##### MACRO gst_pad_get_name ##### -->
 <para>
 
 </para>
@@ -526,6 +506,9 @@ gst_element_request_pad_by_name() or gst_element_request_compatible_pad().
 </para>
 
 @pad: 
+@mode: 
+@Returns: 
+<!-- # Unused Parameters # -->
 @active: 
 
 
@@ -556,7 +539,7 @@ gst_element_request_pad_by_name() or gst_element_request_compatible_pad().
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_pad_set_parent ##### -->
+<!-- ##### MACRO gst_pad_set_parent ##### -->
 <para>
 
 </para>
@@ -565,7 +548,7 @@ gst_element_request_pad_by_name() or gst_element_request_compatible_pad().
 @parent: 
 
 
-<!-- ##### FUNCTION gst_pad_get_parent ##### -->
+<!-- ##### MACRO gst_pad_get_parent ##### -->
 <para>
 
 </para>
@@ -583,42 +566,6 @@ gst_element_request_pad_by_name() or gst_element_request_compatible_pad().
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_pad_get_scheduler ##### -->
-<para>
-
-</para>
-
-@pad: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_pad_add_ghost_pad ##### -->
-<para>
-
-</para>
-
-@pad: 
-@ghostpad: 
-
-
-<!-- ##### FUNCTION gst_pad_remove_ghost_pad ##### -->
-<para>
-
-</para>
-
-@pad: 
-@ghostpad: 
-
-
-<!-- ##### FUNCTION gst_pad_get_ghost_pad_list ##### -->
-<para>
-
-</para>
-
-@pad: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_pad_get_pad_template ##### -->
 <para>
 
@@ -647,6 +594,7 @@ gst_element_request_pad_by_name() or gst_element_request_compatible_pad().
 @pad: 
 @offset: 
 @size: 
+@caps: 
 @Returns: 
 
 
@@ -659,15 +607,6 @@ gst_element_request_pad_by_name() or gst_element_request_compatible_pad().
 @chain: 
 
 
-<!-- ##### FUNCTION gst_pad_set_get_function ##### -->
-<para>
-
-</para>
-
-@pad: 
-@get: 
-
-
 <!-- ##### FUNCTION gst_pad_set_event_function ##### -->
 <para>
 
@@ -771,6 +710,7 @@ gst_element_request_pad_by_name() or gst_element_request_compatible_pad().
 
 @srcpad: 
 @sinkpad: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gst_pad_is_linked ##### -->
@@ -800,15 +740,6 @@ gst_element_request_pad_by_name() or gst_element_request_compatible_pad().
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_pad_is_negotiated ##### -->
-<para>
-
-</para>
-
-@pad: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_pad_get_caps ##### -->
 <para>
 
@@ -827,36 +758,6 @@ gst_element_request_pad_by_name() or gst_element_request_compatible_pad().
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_pad_try_set_caps ##### -->
-<para>
-
-</para>
-
-@pad: 
-@caps: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_pad_try_set_caps_nonfixed ##### -->
-<para>
-
-</para>
-
-@pad: 
-@caps: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_pad_check_compatibility ##### -->
-<para>
-
-</para>
-
-@srcpad: 
-@sinkpad: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_pad_set_getcaps_function ##### -->
 <para>
 
@@ -866,72 +767,6 @@ gst_element_request_pad_by_name() or gst_element_request_compatible_pad().
 @getcaps: 
 
 
-<!-- ##### FUNCTION gst_pad_set_fixate_function ##### -->
-<para>
-
-</para>
-
-@pad: 
-@fixate: 
-
-
-<!-- ##### FUNCTION gst_pad_proxy_getcaps ##### -->
-<para>
-
-</para>
-
-@pad: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_pad_proxy_pad_link ##### -->
-<para>
-
-</para>
-
-@pad: 
-@caps: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_pad_proxy_fixate ##### -->
-<para>
-
-</para>
-
-@pad: 
-@caps: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_pad_proxy_link ##### -->
-<para>
-
-</para>
-
-@pad: 
-@caps: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_pad_set_explicit_caps ##### -->
-<para>
-
-</para>
-
-@pad: 
-@caps: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_pad_use_explicit_caps ##### -->
-<para>
-
-</para>
-
-@pad: 
-
-
 <!-- ##### FUNCTION gst_pad_relink_filtered ##### -->
 <para>
 
@@ -943,89 +778,28 @@ gst_element_request_pad_by_name() or gst_element_request_compatible_pad().
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_pad_perform_negotiate ##### -->
-<para>
-
-</para>
-
-@srcpad: 
-@sinkpad: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_pad_renegotiate ##### -->
-<para>
-
-</para>
-
-@pad: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_pad_unnegotiate ##### -->
-<para>
-
-</para>
-
-@pad: 
-
-
-<!-- ##### FUNCTION gst_pad_try_relink_filtered ##### -->
-<para>
-
-</para>
-
-@srcpad: 
-@sinkpad: 
-@filtercaps: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_pad_get_allowed_caps ##### -->
 <para>
 
 </para>
 
-@pad: 
+@srcpad: 
 @Returns: 
-
-
-<!-- ##### FUNCTION gst_pad_caps_change_notify ##### -->
-<para>
-
-</para>
-
+<!-- # Unused Parameters # -->
 @pad: 
 
 
-<!-- ##### FUNCTION gst_pad_recover_caps_error ##### -->
-<para>
-
-</para>
-
-@pad: 
-@allowed: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_pad_push ##### -->
 <para>
 
 </para>
 
 @pad: 
-@data: 
-<!-- # Unused Parameters # -->
-@buf: 
-
-
-<!-- ##### FUNCTION gst_pad_pull ##### -->
-<para>
-
-</para>
-
-@pad: 
+@buffer: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@data: 
+@buf: 
 
 
 <!-- ##### FUNCTION gst_pad_send_event ##### -->
@@ -1048,72 +822,6 @@ gst_element_request_pad_by_name() or gst_element_request_compatible_pad().
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_pad_select ##### -->
-<para>
-
-</para>
-
-@pad: 
-@Varargs: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@padlist: 
-
-
-<!-- ##### FUNCTION gst_pad_selectv ##### -->
-<para>
-
-</para>
-
-@padlist: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@pad: 
-@Varargs: 
-
-
-<!-- ##### FUNCTION gst_pad_select_valist ##### -->
-<para>
-
-</para>
-
-@pad: 
-@varargs: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_pad_collect ##### -->
-<para>
-
-</para>
-
-@selected: 
-@pad: 
-@Varargs: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_pad_collectv ##### -->
-<para>
-
-</para>
-
-@selected: 
-@padlist: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_pad_collect_valist ##### -->
-<para>
-
-</para>
-
-@selected: 
-@pad: 
-@varargs: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_pad_set_formats_function ##### -->
 <para>
 
diff --git a/docs/gst/tmpl/gstpadtemplate.sgml b/docs/gst/tmpl/gstpadtemplate.sgml
index ce843c0491..1cc95f927b 100644
--- a/docs/gst/tmpl/gstpadtemplate.sgml
+++ b/docs/gst/tmpl/gstpadtemplate.sgml
@@ -196,13 +196,3 @@ Flags for the padtemplate
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_pad_template_get_caps_by_name ##### -->
-<para>
-
-</para>
-
-@templ: 
-@name: 
-@Returns: 
-
-
diff --git a/docs/gst/tmpl/gstscheduler.sgml b/docs/gst/tmpl/gstscheduler.sgml
index e2ffbf5134..1d19a64cc9 100644
--- a/docs/gst/tmpl/gstscheduler.sgml
+++ b/docs/gst/tmpl/gstscheduler.sgml
@@ -25,8 +25,6 @@ This is a base class for custom schedulers.
 Flags for the scheduler
 </para>
 
-@GST_SCHEDULER_FLAG_FIXED_CLOCK: The scheduler has a fixed clock
-@GST_SCHEDULER_FLAG_NEW_API: 
 @GST_SCHEDULER_FLAG_LAST: subclasses can start numbering their flags starting
                           from here.
 
@@ -46,16 +44,6 @@ Get the state of the scheduler.
 @sched: the scheduler to get the state of.
 
 
-<!-- ##### ENUM GstSchedulerState ##### -->
-<para>
-The state of the scheduler
-</para>
-
-@GST_SCHEDULER_STATE_NONE: no state
-@GST_SCHEDULER_STATE_RUNNING: the scheduler is running
-@GST_SCHEDULER_STATE_STOPPED: the scheduler is stopped
-@GST_SCHEDULER_STATE_ERROR: the scheduler is in error
-
 <!-- ##### FUNCTION gst_scheduler_setup ##### -->
 <para>
 
@@ -72,139 +60,6 @@ The state of the scheduler
 @sched: 
 
 
-<!-- ##### FUNCTION gst_scheduler_add_element ##### -->
-<para>
-
-</para>
-
-@sched: 
-@element: 
-
-
-<!-- ##### FUNCTION gst_scheduler_remove_element ##### -->
-<para>
-
-</para>
-
-@sched: 
-@element: 
-
-
-<!-- ##### FUNCTION gst_scheduler_add_scheduler ##### -->
-<para>
-
-</para>
-
-@sched: 
-@sched2: 
-
-
-<!-- ##### FUNCTION gst_scheduler_remove_scheduler ##### -->
-<para>
-
-</para>
-
-@sched: 
-@sched2: 
-
-
-<!-- ##### FUNCTION gst_scheduler_state_transition ##### -->
-<para>
-
-</para>
-
-@sched: 
-@element: 
-@transition: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_scheduler_scheduling_change ##### -->
-<para>
-
-</para>
-
-@sched: 
-@element: 
-
-
-<!-- ##### FUNCTION gst_scheduler_lock_element ##### -->
-<para>
-
-</para>
-
-@sched: 
-@element: 
-
-
-<!-- ##### FUNCTION gst_scheduler_unlock_element ##### -->
-<para>
-
-</para>
-
-@sched: 
-@element: 
-
-
-<!-- ##### FUNCTION gst_scheduler_yield ##### -->
-<para>
-
-</para>
-
-@sched: 
-@element: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_scheduler_interrupt ##### -->
-<para>
-
-</para>
-
-@sched: 
-@element: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_scheduler_error ##### -->
-<para>
-
-</para>
-
-@sched: 
-@element: 
-
-
-<!-- ##### FUNCTION gst_scheduler_pad_link ##### -->
-<para>
-
-</para>
-
-@sched: 
-@srcpad: 
-@sinkpad: 
-
-
-<!-- ##### FUNCTION gst_scheduler_pad_unlink ##### -->
-<para>
-
-</para>
-
-@sched: 
-@srcpad: 
-@sinkpad: 
-
-
-<!-- ##### FUNCTION gst_scheduler_pad_select ##### -->
-<para>
-
-</para>
-
-@sched: 
-@padlist: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_scheduler_clock_wait ##### -->
 <para>
 
@@ -220,50 +75,6 @@ The state of the scheduler
 @time: 
 
 
-<!-- ##### FUNCTION gst_scheduler_iterate ##### -->
-<para>
-
-</para>
-
-@sched: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_scheduler_use_clock ##### -->
-<para>
-
-</para>
-
-@sched: 
-@clock: 
-
-
-<!-- ##### FUNCTION gst_scheduler_set_clock ##### -->
-<para>
-
-</para>
-
-@sched: 
-@clock: 
-
-
-<!-- ##### FUNCTION gst_scheduler_get_clock ##### -->
-<para>
-
-</para>
-
-@sched: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_scheduler_auto_clock ##### -->
-<para>
-
-</para>
-
-@sched: 
-
-
 <!-- ##### FUNCTION gst_scheduler_show ##### -->
 <para>
 
diff --git a/docs/gst/tmpl/gststructure.sgml b/docs/gst/tmpl/gststructure.sgml
index a0b2b7eab4..827f345238 100644
--- a/docs/gst/tmpl/gststructure.sgml
+++ b/docs/gst/tmpl/gststructure.sgml
@@ -20,9 +20,6 @@ Generic structure containing fields of names and values
 </para>
 
 @type: 
-@name: 
-@fields: 
-@_gst_reserved: 
 
 <!-- ##### USER_FUNCTION GstStructureForeachFunc ##### -->
 <para>
diff --git a/docs/gst/tmpl/gstthread.sgml b/docs/gst/tmpl/gstthread.sgml
index b4f1918d06..faebee8c62 100644
--- a/docs/gst/tmpl/gstthread.sgml
+++ b/docs/gst/tmpl/gstthread.sgml
@@ -18,63 +18,3 @@ A Thread can act as a toplevel bin as it has its own scheduler.
 #GstBin, #GstPipeline
 </para>
 
-<!-- ##### STRUCT GstThread ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GstThread::shutdown ##### -->
-<para>
-
-</para>
-
-@gstthread: the object which received the signal.
-
-<!-- ##### ARG GstThread:priority ##### -->
-<para>
-The thread priority
-</para>
-
-<!-- ##### VARIABLE gst_thread_current ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ENUM GstThreadState ##### -->
-<para>
-Thread flags:
-</para>
-
-@GST_THREAD_STATE_SPINNING: The thread is runnning
-@GST_THREAD_STATE_REAPING: The thread is ending.
-@GST_THREAD_STATE_WAITING: 
-@GST_THREAD_FLAG_LAST: subclass use this to start their enumeration
-
-<!-- ##### FUNCTION gst_thread_new ##### -->
-<para>
-
-</para>
-
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_thread_set_priority ##### -->
-<para>
-
-</para>
-
-@thread: 
-@priority: 
-
-
-<!-- ##### FUNCTION gst_thread_get_current ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-