diff --git a/ChangeLog b/ChangeLog
index f429ea83c2..d076b1df08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-05-02  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst/gstregistry.h:
+	  win32/mingw obviously did not work
+	* gst/gsttag.h:
+	  remove some whitespace
+	* libs/gst/dataprotocol/dataprotocol.c: (gst_dp_dump_byte_array):
+	  put back a fix that accidentally got reverted in a backport
+
 2005-05-02  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst/gsttrace.c: (read_tsc), (gst_trace_read_tsc):
@@ -1475,7 +1484,7 @@
 
 	* gst/gstplugin.c:
 	* gst/gstplugin.h:
-	  add accessor for version field
+	  API: add accessor for version field
 
 2004-12-06  Thomas Vander Stichele  <thomas at apestaart dot org>
 
@@ -8267,7 +8276,7 @@
 2004-01-26  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst/gsterror.h: reinstate GST_LIBRARY_ERROR_ENCODE until
-          policy is set
+	  policy is set
 
 2004-01-26  Benjamin Otte  <in7y118@public.uni-hamburg.de>
 
diff --git a/docs/gst/tmpl/gstchildproxy.sgml b/docs/gst/tmpl/gstchildproxy.sgml
index a8185b119e..22c62afa78 100644
--- a/docs/gst/tmpl/gstchildproxy.sgml
+++ b/docs/gst/tmpl/gstchildproxy.sgml
@@ -2,22 +2,19 @@
 GstChildProxy
 
 <!-- ##### SECTION Short_Description ##### -->
-interface for multi child element property access
+
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-This interface provides a uniform way to access child objects of elements.
-There are methods to get the children and methods to (recursivly) set and get
-their properties.
+
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
 
 <!-- ##### FUNCTION gst_child_proxy_get_children_count ##### -->
 <para>
diff --git a/docs/gst/tmpl/gstelement.sgml b/docs/gst/tmpl/gstelement.sgml
index c3416f1f3e..e82ca5ac15 100644
--- a/docs/gst/tmpl/gstelement.sgml
+++ b/docs/gst/tmpl/gstelement.sgml
@@ -2,68 +2,19 @@
 GstElement
 
 <!-- ##### SECTION Short_Description ##### -->
-Abstract base class for all pipeline elements
+
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-GstElement is the base class needed to construct an element that can be
-used in a GStreamer pipeline.  As such, it is not a functional entity, and
-cannot do anything when placed in a pipeline.
+
 </para>
 
-<para>
-The name of a GstElement can be get with gst_element_get_name() and set with
-gst_element_set_name().  For speed, GST_ELEMENT_NAME() can be used in the 
-core.
-Do not use this in plug-ins or applications in order to retain ABI 
-compatibility.
-</para>
-
-<para>
-All elements have pads (of the type #GstPad).  These pads link to pads on
-other elements.  Buffers flow between these linked pads.
-A GstElement has a GList of #GstPad structures for all their input (or sink)
-and output (or source) pads.  
-Core and plug-in writers can add and remove pads with gst_element_add_pad()
-and gst_element_remove_pad().
-Application writers can manipulate ghost pads (copies of real pads inside a bin)
-with gst_element_add_ghost_pad() and gst_element_remove_ghost_pad().
-A pad of an element can be retrieved by name with gst_element_get_pad().
-A GList of all pads can be retrieved with gst_element_get_pad_list().
-</para>
-
-<para>
-Elements can be linked through their pads.
-If the link is straightforward, use the gst_element_link() 
-convenience function to link two elements, or gst_element_link_many() 
-for more elements in a row.
-Use gst_element_link_filtered() to link two elements constrained by
-a specified set of #GstCaps.
-For finer control, use gst_element_link_pads() and 
-gst_element_link_pads_filtered() to specify the pads to link on 
-each element by name.
-</para>
-
-<para>
-Each element has a state (see #GstElementState).  You can get and set the state
-of an element with gst_element_get_state() and gst_element_set_state().  
-You can wait for an element to change it's state with gst_element_wait_state_change().
-To get a string representation of a #GstElementState, use 
-gst_element_state_get_name().
-</para>
-
-<para>
-You can get and set a #GstClock on an element using gst_element_get_clock()
-and gst_element_set_clock().  You can wait for the clock to reach a given
-#GstClockTime using gst_element_clock_wait().
-</para>
 
 <!-- ##### SECTION See_Also ##### -->
 <para>
-#GstElementFactory, #GstPad
+
 </para>
 
-<!-- basic object functions -->
 
 <!-- ##### STRUCT GstElement ##### -->
 <para>
@@ -131,107 +82,107 @@ and gst_element_set_clock().  You can wait for the clock to reach a given
 
 <!-- ##### MACRO GST_NUM_STATES ##### -->
 <para>
-The maximun number of states.
+
 </para>
 
 
 
 <!-- ##### MACRO GST_STATE ##### -->
 <para>
-This macro returns the current state of the element.
+
 </para>
 
-@obj: Element to return state for.
+@obj: 
 
 
 <!-- ##### MACRO GST_STATE_PENDING ##### -->
 <para>
-This macro returns the currently pending state of the element.
+
 </para>
 
-@obj: Element to return the pending state for.
+@obj: 
 
 
 <!-- ##### MACRO GST_STATE_TRANSITION ##### -->
 <para>
-Returns the state transition this object is going through.
+
 </para>
 
-@obj: the Element to return the state transition for
+@obj: 
 
 
 <!-- ##### MACRO GST_STATE_NULL_TO_READY ##### -->
 <para>
-The Element is going from the NULL state to the READY state.
+
 </para>
 
 
 
 <!-- ##### MACRO GST_STATE_READY_TO_PAUSED ##### -->
 <para>
-The Element is going from the READY state to the PAUSED state.
+
 </para>
 
 
 
 <!-- ##### MACRO GST_STATE_PAUSED_TO_PLAYING ##### -->
 <para>
-The Element is going from the PAUSED state to the PLAYING state.
+
 </para>
 
 
 
 <!-- ##### MACRO GST_STATE_PLAYING_TO_PAUSED ##### -->
 <para>
-The Element is going from the PLAYING state to the PAUSED state.
+
 </para>
 
 
 
 <!-- ##### MACRO GST_STATE_PAUSED_TO_READY ##### -->
 <para>
-The Element is going from the PAUSED state to the READY state.
+
 </para>
 
 
 
 <!-- ##### MACRO GST_STATE_READY_TO_NULL ##### -->
 <para>
-The Element is going from the READY state to the NULL state.
+
 </para>
 
 
 
 <!-- ##### MACRO GST_ELEMENT_QUERY_TYPE_FUNCTION ##### -->
 <para>
-Helper macro to create query type functions
+
 </para>
 
-@functionname: The function name
-@...: list of query types.
+@functionname: 
+@...: 
 
 
 <!-- ##### MACRO GST_ELEMENT_FORMATS_FUNCTION ##### -->
 <para>
-Halper macro to create element format functions
+
 </para>
 
-@functionname: The function name
-@...: formats
+@functionname: 
+@...: 
 
 
 <!-- ##### MACRO GST_ELEMENT_EVENT_MASK_FUNCTION ##### -->
 <para>
-A helper macro to create a mask function
+
 </para>
 
-@functionname: the name of the mask function
-@...: Masks
+@functionname: 
+@...: 
 
 
 <!-- ##### ENUM GstElementFlags ##### -->
 <para>
-This enum defines the standard flags that an element may have.
+
 </para>
 
 @GST_ELEMENT_COMPLEX: 
@@ -245,70 +196,71 @@ This enum defines the standard flags that an element may have.
 @GST_ELEMENT_SCHEDULER_PRIVATE2: 
 @GST_ELEMENT_LOCKED_STATE: 
 @GST_ELEMENT_IN_ERROR: 
+@GST_ELEMENT_WORK_IN_PLACE: 
 @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
+@obj: 
 
 
 <!-- ##### MACRO GST_ELEMENT_IS_EVENT_AWARE ##### -->
 <para>
-Query wether this element can handle events.
+
 </para>
 
-@obj: a #GstElement to query
+@obj: 
 
 
 <!-- ##### MACRO GST_ELEMENT_IS_DECOUPLED ##### -->
 <para>
-Queries if the Element is decoupled.
+
 </para>
 
-@obj: a #GstElement to query
+@obj: 
 
 
 <!-- ##### MACRO GST_ELEMENT_NAME ##### -->
 <para>
-Gets the name of this element.  Used in the core.  Not ABI-compatible.
+
 </para>
 
-@obj: A #GstElement to query
+@obj: 
 
 
 <!-- ##### MACRO GST_ELEMENT_PARENT ##### -->
 <para>
-Get the parent object of this element.
+
 </para>
 
-@obj: a #GstElement to query
+@obj: 
 
 
 <!-- ##### MACRO GST_ELEMENT_SCHED ##### -->
 <para>
-Get the scheduler of this element.
+
 </para>
 
-@obj: a #GstElement to query
+@obj: 
 
 
 <!-- ##### MACRO GST_ELEMENT_CLOCK ##### -->
 <para>
-Get the clock of this element
+
 </para>
 
-@obj: a #GstElement to query
+@obj: 
 
 
 <!-- ##### MACRO GST_ELEMENT_PADS ##### -->
 <para>
-Get the pads of this elements.
+
 </para>
 
-@obj: a #GstElement to query
+@obj: 
 
 
 <!-- ##### MACRO GST_ELEMENT_ERROR ##### -->
@@ -325,30 +277,26 @@ Get the pads of this elements.
 
 <!-- ##### 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.
+@element: 
 
 
 <!-- ##### USER_FUNCTION GstElementPreRunFunction ##### -->
 <para>
-The signature of the function to execute after this element
-is scheduled.
+
 </para>
 
-@element: The element
+@element: 
 
 
 <!-- ##### USER_FUNCTION GstElementPostRunFunction ##### -->
 <para>
-The signature of the function to execute before this element
-is scheduled.
+
 </para>
 
-@element: The element
+@element: 
 
 
 <!-- ##### FUNCTION gst_element_class_add_pad_template ##### -->
@@ -381,8 +329,7 @@ is scheduled.
 
 <!-- ##### MACRO gst_element_default_deep_notify ##### -->
 <para>
-The default deep notify handler that prints out the property change
-notifications to stdout.
+
 </para>
 
 
@@ -409,41 +356,36 @@ notifications to stdout.
 
 <!-- ##### MACRO gst_element_get_name ##### -->
 <para>
-Gets the name of the element.
+
 </para>
 
 @elem: 
-@Returns: the name of the element.
-
-
-<!-- link -->
 
 
 <!-- ##### MACRO gst_element_set_name ##### -->
 <para>
-Sets the name of the element, getting rid of the old name if there was one.
+
 </para>
 
-@elem: a #GstElement to set the name of.
-@name: the new name of the element.
+@elem: 
+@name: 
 
 
 <!-- ##### MACRO gst_element_get_parent ##### -->
 <para>
-Gets the parent of an element.
+
 </para>
 
-@elem: a #GstElement to get the parent of.
-@Returns: the #GstObject parent of the element.
+@elem: 
 
 
 <!-- ##### MACRO gst_element_set_parent ##### -->
 <para>
-Sets the parent of an element.
+
 </para>
 
-@elem: a #GstElement to set the parent of.
-@parent:  the new #GstObject parent of the object.
+@elem: 
+@parent: 
 
 
 <!-- ##### FUNCTION gst_element_set ##### -->
@@ -575,9 +517,6 @@ Sets the parent of an element.
 @id: 
 @jitter: 
 @Returns: 
-<!-- # Unused Parameters # -->
-@clock: 
-@time: 
 
 
 <!-- ##### FUNCTION gst_element_get_time ##### -->
@@ -736,9 +675,6 @@ Sets the parent of an element.
 @pad: 
 
 
-<!-- pad template manipulation -->
-
-
 <!-- ##### FUNCTION gst_element_get_pad ##### -->
 <para>
 
@@ -746,7 +682,7 @@ Sets the parent of an element.
 
 @element: 
 @name: 
-@Returns: GList of #GstPads
+@Returns: 
 
 
 <!-- ##### FUNCTION gst_element_get_static_pad ##### -->
@@ -846,10 +782,6 @@ Sets the parent of an element.
 @Returns: 
 
 
-
-<!-- scheduling -->
-
-
 <!-- ##### FUNCTION gst_element_get_compatible_pad_template ##### -->
 <para>
 
@@ -947,9 +879,6 @@ Sets the parent of an element.
 @destpadname: 
 
 
-<!-- pad manipulation -->
-
-
 <!-- ##### FUNCTION gst_element_get_event_masks ##### -->
 <para>
 
@@ -1146,8 +1075,6 @@ Sets the parent of an element.
 @element: 
 @Returns: 
 
-<!-- clocking -->
-
 
 <!-- ##### FUNCTION gst_element_no_more_pads ##### -->
 <para>
diff --git a/docs/gst/tmpl/gsttaglist.sgml b/docs/gst/tmpl/gsttaglist.sgml
index 64559f8c9a..b9f9441afe 100644
--- a/docs/gst/tmpl/gsttaglist.sgml
+++ b/docs/gst/tmpl/gsttaglist.sgml
@@ -2,18 +2,20 @@
 GstTagList
 
 <!-- ##### SECTION Short_Description ##### -->
-List of tags and values used to describe media metadata
+
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
+
 <!-- ##### TYPEDEF GstTagList ##### -->
 <para>
 
@@ -854,3 +856,10 @@ List of tags and values used to describe media metadata
 
 
 
+<!-- ##### MACRO GST_TAG_LANGUAGE_CODE ##### -->
+<para>
+
+</para>
+
+
+
diff --git a/gst/gstregistry.h b/gst/gstregistry.h
index f4676df63a..5ae759c74e 100644
--- a/gst/gstregistry.h
+++ b/gst/gstregistry.h
@@ -36,28 +36,28 @@
 
 /* compatibility for pre-POSIX defines */
 #ifdef S_IRUSR
-#if defined(_WIN32) && defined(__MINGW32__)
-#define REGISTRY_DIR_PERMS (S_ISGID | \
-                            S_IRUSR | S_IWUSR | S_IXUSR)
+#  if defined(_WIN32) && defined(__MINGW32__)
+#    define REGISTRY_DIR_PERMS   (S_ISGID | \
+                                  S_IRUSR | S_IWUSR | S_IXUSR)
+#  else
+#    define REGISTRY_DIR_PERMS   (S_ISGID | \
+                                  S_IRUSR | S_IWUSR | S_IXUSR | \
+		                  S_IRGRP | S_IXGRP | \
+			          S_IROTH | S_IXOTH)
+#  endif
+#  define REGISTRY_TMPFILE_PERMS (S_IRUSR | S_IWUSR)
+#  if defined(_WIN32) && defined(__MINGW32__)
+#    define REGISTRY_FILE_PERMS  (S_IRUSR | S_IWUSR)
+#  else
+#    define REGISTRY_FILE_PERMS  (S_IRUSR | S_IWUSR | \
+                                  S_IRGRP | S_IWGRP | \
+			          S_IROTH | S_IWOTH)
+#  endif
 #else
-#define REGISTRY_DIR_PERMS (S_ISGID | \
-                            S_IRUSR | S_IWUSR | S_IXUSR | \
-		            S_IRGRP | S_IXGRP | \
-			    S_IROTH | S_IXOTH)
-#endif
-#define REGISTRY_TMPFILE_PERMS (S_IRUSR | S_IWUSR)
-#if defined(_WIN32) && defined(__MINGW32__)
-#define REGISTRY_FILE_PERMS (S_IRUSR | S_IWUSR
-#else
-#define REGISTRY_FILE_PERMS (S_IRUSR | S_IWUSR | \
-                             S_IRGRP | S_IWGRP | \
-			     S_IROTH | S_IWOTH)
-#endif
-#else
-#define REGISTRY_DIR_PERMS (S_ISGID | \
-                            S_IREAD | S_IWRITE | S_IEXEC)
-#define REGISTRY_TMPFILE_PERMS (S_IREAD | S_IWRITE)
-#define REGISTRY_FILE_PERMS (S_IREAD | S_IWRITE)
+#  define REGISTRY_DIR_PERMS     (S_ISGID | \
+                                  S_IREAD | S_IWRITE | S_IEXEC)
+#  define REGISTRY_TMPFILE_PERMS (S_IREAD | S_IWRITE)
+#  define REGISTRY_FILE_PERMS    (S_IREAD | S_IWRITE)
 #endif
 
 G_BEGIN_DECLS
diff --git a/gst/gsttag.h b/gst/gsttag.h
index b24244c861..f7bca61aba 100644
--- a/gst/gsttag.h
+++ b/gst/gsttag.h
@@ -123,7 +123,7 @@ G_CONST_RETURN GValue *
 		gst_tag_list_get_value_index	(const GstTagList *	list,
 						 const gchar *		tag,
 						 guint			index);
-gboolean      	gst_tag_list_copy_value		(GValue *		dest,
+gboolean	gst_tag_list_copy_value		(GValue *		dest,
 						 const GstTagList *	list,
 						 const gchar *		tag);
 
@@ -212,7 +212,7 @@ gboolean	gst_tag_list_get_string_index	(const GstTagList *	list,
 						 const gchar *		tag,
 						 guint			index,
 						 gchar **		value);
-gboolean	gst_tag_list_get_pointer      	(const GstTagList *	list,
+gboolean	gst_tag_list_get_pointer	(const GstTagList *	list,
 						 const gchar *		tag,
 						 gpointer *		value);
 gboolean	gst_tag_list_get_pointer_index	(const GstTagList *	list,
@@ -423,7 +423,7 @@ GstTagList *	gst_event_tag_get_list		(GstEvent *		tag_event);
  *
  * album gain in db
  */
-#define GST_TAG_ALBUM_GAIN  		"replaygain-album-gain"
+#define GST_TAG_ALBUM_GAIN		"replaygain-album-gain"
 /**
  * GST_TAG_ALBUM_PEAK:
  *
diff --git a/gst/gsttaglist.h b/gst/gsttaglist.h
index b24244c861..f7bca61aba 100644
--- a/gst/gsttaglist.h
+++ b/gst/gsttaglist.h
@@ -123,7 +123,7 @@ G_CONST_RETURN GValue *
 		gst_tag_list_get_value_index	(const GstTagList *	list,
 						 const gchar *		tag,
 						 guint			index);
-gboolean      	gst_tag_list_copy_value		(GValue *		dest,
+gboolean	gst_tag_list_copy_value		(GValue *		dest,
 						 const GstTagList *	list,
 						 const gchar *		tag);
 
@@ -212,7 +212,7 @@ gboolean	gst_tag_list_get_string_index	(const GstTagList *	list,
 						 const gchar *		tag,
 						 guint			index,
 						 gchar **		value);
-gboolean	gst_tag_list_get_pointer      	(const GstTagList *	list,
+gboolean	gst_tag_list_get_pointer	(const GstTagList *	list,
 						 const gchar *		tag,
 						 gpointer *		value);
 gboolean	gst_tag_list_get_pointer_index	(const GstTagList *	list,
@@ -423,7 +423,7 @@ GstTagList *	gst_event_tag_get_list		(GstEvent *		tag_event);
  *
  * album gain in db
  */
-#define GST_TAG_ALBUM_GAIN  		"replaygain-album-gain"
+#define GST_TAG_ALBUM_GAIN		"replaygain-album-gain"
 /**
  * GST_TAG_ALBUM_PEAK:
  *
diff --git a/libs/gst/dataprotocol/dataprotocol.c b/libs/gst/dataprotocol/dataprotocol.c
index ef832bbb29..019ea59a73 100644
--- a/libs/gst/dataprotocol/dataprotocol.c
+++ b/libs/gst/dataprotocol/dataprotocol.c
@@ -83,7 +83,7 @@ gst_dp_dump_byte_array (guint8 * array, guint length)
 {
   int i;
   int n = 8;                    /* number of bytes per line */
-  gchar *line = g_malloc (3 * n);
+  gchar *line = g_malloc (3 * n + 1);
 
   GST_LOG ("dumping byte array of length %d", length);
   for (i = 0; i < length; ++i) {