diff --git a/ChangeLog b/ChangeLog
index 38ecc972bd..6e5261877c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-10-12  Stefan Kost  <ensonic@users.sf.net>
+
+	* gst/gst.c:
+	* gst/gstminiobject.h:
+	* gst/gstpad.h:
+	* win32/gstenumtypes.c: (gst_mini_object_flags_get_type):
+	  removed unused flags from miniobject
+	  doc fixes
+
 2005-10-12  Wim Taymans  <wim@fluendo.com>
 
 	* gst/elements/gstfilesink.c: (gst_file_sink_do_seek),
diff --git a/gst/gst.c b/gst/gst.c
index 4b635d4c5b..40e166f5b8 100644
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -359,9 +359,11 @@ gst_init_check (int *argc, char **argv[], GError ** err)
  * Initializes the GStreamer library, setting up internal path lists,
  * registering built-in elements, and loading standard plugins.
  *
+ * <note><para>
  * This function will terminate your program if it was unable to initialize
  * GStreamer for some reason.  If you want your program to fall back,
  * use gst_init_check() instead.
+ * </para></note>
  *
  * WARNING: This function does not work in the same way as corresponding
  * functions in other glib-style libraries, such as gtk_init().  In
diff --git a/gst/gstminiobject.h b/gst/gstminiobject.h
index fe2a89c95b..9d6e09f0c3 100644
--- a/gst/gstminiobject.h
+++ b/gst/gstminiobject.h
@@ -86,7 +86,6 @@ typedef void (*GstMiniObjectFinalizeFunction) (GstMiniObject *);
 /**
  * GstMiniObjectFlags:
  * @GST_MINI_OBJECT_FLAG_READONLY: is the miniobject readonly or writable
- * @GST_MINI_OBJECT_FLAG_STATIC: 
  * @GST_MINI_OBJECT_FLAG_LAST: first flag that can be used by subclasses.
  *
  * Flags for the padtemplate
@@ -95,7 +94,6 @@ typedef void (*GstMiniObjectFinalizeFunction) (GstMiniObject *);
 typedef enum
 {
   GST_MINI_OBJECT_FLAG_READONLY = (1<<0),
-  GST_MINI_OBJECT_FLAG_STATIC = (1<<1),
   /* padding */
   GST_MINI_OBJECT_FLAG_LAST = (1<<4)
 } GstMiniObjectFlags;
diff --git a/gst/gstpad.h b/gst/gstpad.h
index e0df0c0c1f..38f269d799 100644
--- a/gst/gstpad.h
+++ b/gst/gstpad.h
@@ -84,20 +84,20 @@ typedef enum {
  * GST_PAD_LINK_SUCCESSFUL:
  * @ret: the #GstPadLinkReturn value
  *
- * Macro to test if the given #GstPadLinkReturn value indicates a successfull
+ * Macro to test if the given #GstPadLinkReturn value indicates a successful
  * link step.
  */
 #define GST_PAD_LINK_SUCCESSFUL(ret) ((ret) >= GST_PAD_LINK_OK)
 
 /**
  * GstFlowReturn:
- * GST_FLOW_RESEND:	  	 Resend buffer, possibly with new caps.
- * GST_FLOW_OK:		  	 Data passing was ok.
- * GST_FLOW_NOT_LINKED:     	 Pad is not linked.
- * GST_FLOW_WRONG_STATE:    	 Pad is in wrong state.
- * GST_FLOW_UNEXPECTED:     	 Did not expect anything, like after EOS.
- * GST_FLOW_NOT_NEGOTIATED: 	 Pad is not negotiated.
- * GST_FLOW_ERROR:	  	 Some (fatal) error occured.
+ * @GST_FLOW_RESEND:	  	 Resend buffer, possibly with new caps.
+ * @GST_FLOW_OK:		 Data passing was ok.
+ * @GST_FLOW_NOT_LINKED:     	 Pad is not linked.
+ * @GST_FLOW_WRONG_STATE:    	 Pad is in wrong state.
+ * @GST_FLOW_UNEXPECTED:     	 Did not expect anything, like after EOS.
+ * @GST_FLOW_NOT_NEGOTIATED: 	 Pad is not negotiated.
+ * @GST_FLOW_ERROR:	  	 Some (fatal) error occured.
  *
  * The result of passing data to a linked pad.
  */
diff --git a/win32/gstenumtypes.c b/win32/gstenumtypes.c
index ee8c4a60bb..4dd13af95f 100644
--- a/win32/gstenumtypes.c
+++ b/win32/gstenumtypes.c
@@ -685,7 +685,6 @@ gst_mini_object_flags_get_type (void)
     static const GFlagsValue values[] = {
       {GST_MINI_OBJECT_FLAG_READONLY, "GST_MINI_OBJECT_FLAG_READONLY",
           "readonly"},
-      {GST_MINI_OBJECT_FLAG_STATIC, "GST_MINI_OBJECT_FLAG_STATIC", "static"},
       {GST_MINI_OBJECT_FLAG_LAST, "GST_MINI_OBJECT_FLAG_LAST", "last"},
       {0, NULL, NULL}
     };