diff --git a/ChangeLog b/ChangeLog
index ed0004fcd5..38e908d6f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-10-13  Stefan Kost  <ensonic@users.sf.net>
+
+	* docs/gst/gstreamer-sections.txt:
+	* gst/gst.c:
+	* gst/gsterror.h:
+	* tools/gst-inspect.c: (main):
+	* tools/gst-launch.c: (main):
+	* tools/gst-run.c: (main):
+	* tools/gst-xmlinspect.c: (main):
+	  fix GOption context leaks
+	  doc fixes
+
 2005-10-13  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst/gstbus.c:
diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt
index ee2c5b2c0a..f1184a93a8 100644
--- a/docs/gst/gstreamer-sections.txt
+++ b/docs/gst/gstreamer-sections.txt
@@ -582,10 +582,6 @@ GST_RESOURCE_ERROR
 GST_STREAM_ERROR
 GST_ERROR_SYSTEM
 gst_error_get_message
-gst_core_error_quark
-gst_library_error_quark
-gst_resource_error_quark
-gst_stream_error_quark
 <SUBSECTION Standard>
 GST_TYPE_G_ERROR
 GST_TYPE_CORE_ERROR
@@ -598,6 +594,10 @@ gst_core_error_get_type
 gst_library_error_get_type
 gst_resource_error_get_type
 gst_stream_error_get_type
+gst_core_error_quark
+gst_library_error_quark
+gst_resource_error_quark
+gst_stream_error_quark
 </SECTION>
 
 
diff --git a/gst/gst.c b/gst/gst.c
index 40e166f5b8..a92923c428 100644
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -250,9 +250,9 @@ parse_debug_list (const gchar * list)
  * and initialization is automated.
  *
  * This function is useful if you want to integrate GStreamer with other
- * libraries that use GOption.
+ * libraries that use GOption (see g_option_context_add_group() ).
  *
- * Returns: a pointer to a GStreamer option group. Should be dereferenced
+ * Returns: a pointer to GStreamer's option group. Should be dereferenced
  * after use.
  */
 
diff --git a/gst/gsterror.h b/gst/gsterror.h
index 2b282f6e66..e22c35df08 100644
--- a/gst/gsterror.h
+++ b/gst/gsterror.h
@@ -187,9 +187,37 @@ typedef enum
 
 #define GST_TYPE_G_ERROR    (gst_g_error_get_type ())
 
+/**
+ * GST_LIBRARY_ERROR:
+ *
+ * Error domain for library loading. Errors in this domain will
+ * be from the #GstLibraryError enumeration.
+ * See #GError for information on error domains.
+ */
 #define GST_LIBRARY_ERROR   gst_library_error_quark ()
+/**
+ * GST_RESOURCE_ERROR:
+ *
+ * Error domain for resource handling. Errors in this domain will
+ * be from the #GstResourceError enumeration.
+ * See #GError for information on error domains.
+ */
 #define GST_RESOURCE_ERROR  gst_resource_error_quark ()
+/**
+ * GST_CORE_ERROR:
+ *
+ * Error domain for core system. Errors in this domain will
+ * be from the #GstCoreError enumeration.
+ * See #GError for information on error domains.
+ */
 #define GST_CORE_ERROR      gst_core_error_quark ()
+/**
+ * GST_STREAM_ERROR:
+ *
+ * Error domain for media stream processing. Errors in this domain will
+ * be from the #GstStreamError enumeration.
+ * See #GError for information on error domains.
+ */
 #define GST_STREAM_ERROR    gst_stream_error_quark ()
 
 /**
diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c
index 4fe5efd41d..c460e2951b 100644
--- a/tools/gst-inspect.c
+++ b/tools/gst-inspect.c
@@ -1117,6 +1117,7 @@ main (int argc, char *argv[])
     g_print ("Error initializing: %s\n", err->message);
     exit (1);
   }
+  g_option_context_free (ctx);
 
   if (print_all && argc > 2) {
     g_print ("-a requires no extra arguments\n");
diff --git a/tools/gst-launch.c b/tools/gst-launch.c
index f15bdbeca1..53b9d4ce83 100644
--- a/tools/gst-launch.c
+++ b/tools/gst-launch.c
@@ -533,6 +533,7 @@ main (int argc, char *argv[])
     g_print ("Error initializing: %s\n", GST_STR_NULL (err->message));
     exit (1);
   }
+  g_option_context_free (ctx);
 
   /* FIXpopt: strip short args, too. We do it ourselves for now */
   j = 1;
diff --git a/tools/gst-run.c b/tools/gst-run.c
index cbcb2a573c..b29280688d 100644
--- a/tools/gst-run.c
+++ b/tools/gst-run.c
@@ -244,6 +244,7 @@ main (int argc, char **argv)
     g_print ("Error initializing: %s\n", err->message);
     exit (1);
   }
+  g_option_context_free (ctx);
 
   /* detect stuff */
   dir = get_dir_of_binary (argv[0]);
diff --git a/tools/gst-xmlinspect.c b/tools/gst-xmlinspect.c
index 64a7e681e4..5b3396a860 100644
--- a/tools/gst-xmlinspect.c
+++ b/tools/gst-xmlinspect.c
@@ -780,6 +780,7 @@ main (int argc, char *argv[])
     g_print ("Error initializing: %s\n", err->message);
     exit (1);
   }
+  g_option_context_free (ctx);
 
   PUT_STRING (0, "<?xml version=\"1.0\"?>");