diff --git a/ChangeLog b/ChangeLog
index 44bc4cf8f3..d35912ff6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-09-14  David Schleef  <ds@schleef.org>
+
+	* docs/gst/gstreamer-docs.sgml:
+	* docs/gst/gstreamer-sections.txt:
+	* docs/gst/gstreamer.types:
+	* docs/gst/tmpl/gstelement.sgml:
+	* docs/gst/tmpl/gstplugin.sgml:
+	* docs/gst/tmpl/gstpluginfeature.sgml:
+	  Documentation updates for registry changes.
+
 2005-09-14  David Schleef  <ds@schleef.org>
 
 	* gst/gstregistryxml.c: Copy g_mkdir_with_parent() from glib,
diff --git a/docs/gst/gstreamer-docs.sgml b/docs/gst/gstreamer-docs.sgml
index e84fe9fca8..d0cce20e19 100644
--- a/docs/gst/gstreamer-docs.sgml
+++ b/docs/gst/gstreamer-docs.sgml
@@ -58,7 +58,6 @@
 <!ENTITY GstValue SYSTEM "xml/gstvalue.xml">
 <!ENTITY GstVersion SYSTEM "xml/gstversion.xml">
 <!ENTITY GstXML SYSTEM "xml/gstxml.xml">
-<!ENTITY GstXMLRegistry SYSTEM "xml/gstxmlregistry.xml">
 
 <!ENTITY GstAdapter SYSTEM "xml/gstadapter.xml">
 <!ENTITY GstBaseSrc SYSTEM "xml/gstbasesrc.xml">
@@ -149,7 +148,6 @@
     &GstValue;
     &GstVersion;
     &GstXML;
-    &GstXMLRegistry;
 
   </chapter>
 
diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt
index eca1e79c43..5b8bc3a6dd 100644
--- a/docs/gst/gstreamer-sections.txt
+++ b/docs/gst/gstreamer-sections.txt
@@ -2197,23 +2197,6 @@ gst_xml_get_type
 </SECTION>
 
 
-<SECTION>
-<FILE>gstxmlregistry</FILE>
-<TITLE>GstXMLRegistry</TITLE>
-GstXMLRegistry
-gst_xml_registry_new
-<SUBSECTION Standard>
-GstXMLRegistryClass
-GST_XML_REGISTRY
-GST_IS_XML_REGISTRY
-GST_XML_REGISTRY_CLASS
-GST_IS_XML_REGISTRY_CLASS
-GST_XML_REGISTRY_GET_CLASS
-GST_TYPE_XML_REGISTRY
-<SUBSECTION Private>
-gst_xml_registry_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gstenumtypes</FILE>
 <TITLE>GstEnumTypes</TITLE>
diff --git a/docs/gst/gstreamer.types b/docs/gst/gstreamer.types
index f2f224fdaa..324f2425e1 100644
--- a/docs/gst/gstreamer.types
+++ b/docs/gst/gstreamer.types
@@ -34,12 +34,6 @@ gst_task_get_type
 gst_type_find_factory_get_type
 gst_xml_get_type
 
-%registries
-
-#include <gst/registries/gstlibxmlregistry.h>
-
-gst_xml_registry_get_type
-
 % base classes
 
 #include <gst/base/gstadapter.h>
diff --git a/docs/gst/tmpl/gstelement.sgml b/docs/gst/tmpl/gstelement.sgml
index 1887252ca9..fb831f6fe3 100644
--- a/docs/gst/tmpl/gstelement.sgml
+++ b/docs/gst/tmpl/gstelement.sgml
@@ -973,6 +973,16 @@ Sets the parent of an element.
 @Returns: 
 
 
+<!-- ##### FUNCTION gst_element_set_state_async ##### -->
+<para>
+
+</para>
+
+@element: 
+@state: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gst_element_state_get_name ##### -->
 <para>
 
diff --git a/docs/gst/tmpl/gstplugin.sgml b/docs/gst/tmpl/gstplugin.sgml
index 0968778f2b..e1345e8055 100644
--- a/docs/gst/tmpl/gstplugin.sgml
+++ b/docs/gst/tmpl/gstplugin.sgml
@@ -67,13 +67,6 @@ The plugin loading errors
 The plugin object
 </para>
 
-@desc: 
-@filename: 
-@features: 
-@numfeatures: 
-@manager: 
-@module: 
-@_gst_reserved: 
 
 <!-- ##### STRUCT GstPluginDesc ##### -->
 <para>
@@ -86,7 +79,6 @@ loaded will use this variable to initialize the plugin.
 @name: a unique name of the plugin
 @description: 
 @plugin_init: The init function of this plugin.
-@plugin_exit: 
 @version: version of the plugin
 @license: effective license of plugin
 @source: 
@@ -106,14 +98,6 @@ It will be called by the loader at statup.
 @module: The <classname>GModule</classname> it was loaded from
 
 
-<!-- ##### USER_FUNCTION GstPluginExitFunc ##### -->
-<para>
-Exiting function when plugin is unloaded.
-</para>
-
-@plugin: The plugin object that can be used to unregister stuff for this plugin.
-
-
 <!-- ##### MACRO GST_PLUGIN_DEFINE ##### -->
 <para>
 This macro needs to be used to define the entry point and meta data of a plugin.
@@ -129,6 +113,8 @@ One would use this macro to export a plugin, so that it can be used by other app
 @license: under which licence the package has been released, e.g. GPL, LGPL.
 @package: the package-name (e.g. PACKAGE_NAME from config.h)
 @origin: a description from where the package comes from (e.g. the homepage URL)
+<!-- # Unused Parameters # -->
+@domain: 
 
 
 <!-- ##### MACRO GST_PLUGIN_DEFINE_STATIC ##### -->
@@ -146,6 +132,8 @@ One would use this macro to define a local plugin that can only be used by the o
 @license: under which licence the package has been released, e.g. GPL, LGPL.
 @package: the package-name (e.g. PACKAGE_NAME from config.h)
 @origin: a description from where the package comes from (e.g. the homepage URL)
+<!-- # Unused Parameters # -->
+@domain: 
 
 
 <!-- ##### MACRO GST_LICENSE_UNKNOWN ##### -->
@@ -330,15 +318,6 @@ to get a list of plugins that match certain criteria.
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_plugin_unload_plugin ##### -->
-<para>
-
-</para>
-
-@plugin: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gst_plugin_add_feature ##### -->
 <para>
 
@@ -353,7 +332,9 @@ to get a list of plugins that match certain criteria.
 
 </para>
 
-@name: 
+@plugin: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@name: 
 
 
diff --git a/docs/gst/tmpl/gstpluginfeature.sgml b/docs/gst/tmpl/gstpluginfeature.sgml
index 96a2e5e5cd..0f433cdd2d 100644
--- a/docs/gst/tmpl/gstpluginfeature.sgml
+++ b/docs/gst/tmpl/gstpluginfeature.sgml
@@ -50,23 +50,6 @@ to get a list of pluginfeature that match certain criteria.
 @Returns: TRUE for a positive match, FALSE otherwise
 
 
-<!-- ##### FUNCTION gst_plugin_feature_ensure_loaded ##### -->
-<para>
-
-</para>
-
-@feature: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gst_plugin_feature_unload_thyself ##### -->
-<para>
-
-</para>
-
-@feature: 
-
-
 <!-- ##### FUNCTION gst_plugin_feature_type_name_filter ##### -->
 <para>