diff --git a/doc/en/GConf.PropertyEditors/EditorNotSupportedException.xml b/doc/en/GConf.PropertyEditors/EditorNotSupportedException.xml
index b9273bdc8..abf681387 100644
--- a/doc/en/GConf.PropertyEditors/EditorNotSupportedException.xml
+++ b/doc/en/GConf.PropertyEditors/EditorNotSupportedException.xml
@@ -4,18 +4,17 @@
     <AssemblyName>gconf-sharp-peditors</AssemblyName>
     <AssemblyPublicKey>
     </AssemblyPublicKey>
-    <AssemblyVersion>2.20.0.0</AssemblyVersion>
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the &lt;link location="node:gtk-sharp/programming/threads"&gt;Gtk# Thread Programming&lt;/link&gt; for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
   <Base>
     <BaseTypeName>System.Exception</BaseTypeName>
   </Base>
   <Interfaces>
   </Interfaces>
+  <Docs>
+    <summary>EditorNotSupported exception.</summary>
+    <remarks />
+  </Docs>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public EditorNotSupportedException ();" />
@@ -23,8 +22,8 @@
       <ReturnValue />
       <Parameters />
       <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
+        <summary>Public constructor.</summary>
+        <remarks />
       </Docs>
     </Member>
   </Members>
diff --git a/doc/en/GConf.PropertyEditors/EditorShell.xml b/doc/en/GConf.PropertyEditors/EditorShell.xml
index 7291203fd..63165b9ef 100644
--- a/doc/en/GConf.PropertyEditors/EditorShell.xml
+++ b/doc/en/GConf.PropertyEditors/EditorShell.xml
@@ -4,20 +4,62 @@
     <AssemblyName>gconf-sharp-peditors</AssemblyName>
     <AssemblyPublicKey>
     </AssemblyPublicKey>
-    <AssemblyVersion>2.20.0.0</AssemblyVersion>
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the &lt;link location="node:gtk-sharp/programming/threads"&gt;Gtk# Thread Programming&lt;/link&gt; for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
   <Base>
     <BaseTypeName>System.Object</BaseTypeName>
   </Base>
   <Interfaces />
+  <Docs>
+    <summary>To be added</summary>
+    <remarks>To be added</remarks>
+  </Docs>
   <Members>
-    <Member MemberName="AddGuard">
-      <MemberSignature Language="C#" Value="public void AddGuard (string key, string control_name);" />
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public EditorShell (Glade.XML gxml);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gxml" Type="Glade.XML" />
+      </Parameters>
+      <Docs>
+        <param name="gxml">To be added: an object of type 'Glade.XML'</param>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public EditorShell (Glade.XML gxml, GConf.ChangeSet cs);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gxml" Type="Glade.XML" />
+        <Parameter Name="cs" Type="GConf.ChangeSet" />
+      </Parameters>
+      <Docs>
+        <param name="gxml">To be added: an object of type 'Glade.XML'</param>
+        <param name="cs">To be added: an object of type 'GConf.ChangeSet'</param>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Add">
+      <MemberSignature Language="C#" Value="public void Add (GConf.PropertyEditors.PropertyEditor editor);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="editor" Type="GConf.PropertyEditors.PropertyEditor" />
+      </Parameters>
+      <Docs>
+        <param name="editor">To be added: an object of type 'GConf.PropertyEditors.PropertyEditor'</param>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Add">
+      <MemberSignature Language="C#" Value="public void Add (string key, string control_name);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
@@ -27,9 +69,9 @@
         <Parameter Name="control_name" Type="System.String" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
         <param name="key">To be added: an object of type 'string'</param>
         <param name="control_name">To be added: an object of type 'string'</param>
+        <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
@@ -45,10 +87,10 @@
         <Parameter Name="enum_type" Type="System.Type" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
         <param name="key">To be added: an object of type 'string'</param>
         <param name="control_name">To be added: an object of type 'string'</param>
         <param name="enum_type">To be added: an object of type 'Type'</param>
+        <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
@@ -65,16 +107,16 @@
         <Parameter Name="enum_values" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
         <param name="key">To be added: an object of type 'string'</param>
         <param name="control_name">To be added: an object of type 'string'</param>
         <param name="enum_type">To be added: an object of type 'Type'</param>
         <param name="enum_values">To be added: an object of type 'int []'</param>
+        <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="Add">
-      <MemberSignature Language="C#" Value="public void Add (string key, string control_name);" />
+    <Member MemberName="AddGuard">
+      <MemberSignature Language="C#" Value="public void AddGuard (string key, string control_name);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
@@ -84,52 +126,9 @@
         <Parameter Name="control_name" Type="System.String" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
         <param name="key">To be added: an object of type 'string'</param>
         <param name="control_name">To be added: an object of type 'string'</param>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Add">
-      <MemberSignature Language="C#" Value="public void Add (GConf.PropertyEditors.PropertyEditor editor);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="editor" Type="GConf.PropertyEditors.PropertyEditor" />
-      </Parameters>
-      <Docs>
         <summary>To be added</summary>
-        <param name="editor">To be added: an object of type 'GConf.PropertyEditors.PropertyEditor'</param>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public EditorShell (Glade.XML gxml);" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
-      <Parameters>
-        <Parameter Name="gxml" Type="Glade.XML" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="gxml">To be added: an object of type 'Glade.XML'</param>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public EditorShell (Glade.XML gxml, GConf.ChangeSet cs);" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
-      <Parameters>
-        <Parameter Name="gxml" Type="Glade.XML" />
-        <Parameter Name="cs" Type="GConf.ChangeSet" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="gxml">To be added: an object of type 'Glade.XML'</param>
-        <param name="cs">To be added: an object of type 'GConf.ChangeSet'</param>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GConf.PropertyEditors/InvalidGladeKeyException.xml b/doc/en/GConf.PropertyEditors/InvalidGladeKeyException.xml
index d457c28f9..18bb9d7f3 100644
--- a/doc/en/GConf.PropertyEditors/InvalidGladeKeyException.xml
+++ b/doc/en/GConf.PropertyEditors/InvalidGladeKeyException.xml
@@ -4,18 +4,17 @@
     <AssemblyName>gconf-sharp-peditors</AssemblyName>
     <AssemblyPublicKey>
     </AssemblyPublicKey>
-    <AssemblyVersion>2.20.0.0</AssemblyVersion>
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the &lt;link location="node:gtk-sharp/programming/threads"&gt;Gtk# Thread Programming&lt;/link&gt; for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
   <Base>
     <BaseTypeName>System.Exception</BaseTypeName>
   </Base>
   <Interfaces>
   </Interfaces>
+  <Docs>
+    <summary>To be added</summary>
+    <remarks>To be added</remarks>
+  </Docs>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public InvalidGladeKeyException (string control_name);" />
@@ -25,8 +24,8 @@
         <Parameter Name="control_name" Type="System.String" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
         <param name="control_name">To be added: an object of type 'string'</param>
+        <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GConf.PropertyEditors/PropertyEditor.xml b/doc/en/GConf.PropertyEditors/PropertyEditor.xml
index 8f55499ee..0cf5517cf 100644
--- a/doc/en/GConf.PropertyEditors/PropertyEditor.xml
+++ b/doc/en/GConf.PropertyEditors/PropertyEditor.xml
@@ -4,20 +4,58 @@
     <AssemblyName>gconf-sharp-peditors</AssemblyName>
     <AssemblyPublicKey>
     </AssemblyPublicKey>
-    <AssemblyVersion>2.20.0.0</AssemblyVersion>
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the &lt;link location="node:gtk-sharp/programming/threads"&gt;Gtk# Thread Programming&lt;/link&gt; for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
   <Base>
     <BaseTypeName>System.Object</BaseTypeName>
   </Base>
   <Interfaces />
+  <Docs>
+    <summary>To be added</summary>
+    <remarks>To be added</remarks>
+  </Docs>
   <Members>
-    <Member MemberName="Setup">
-      <MemberSignature Language="C#" Value="public virtual void Setup ();" />
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public PropertyEditor (string key, Gtk.Widget control);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="key" Type="System.String" />
+        <Parameter Name="control" Type="Gtk.Widget" />
+      </Parameters>
+      <Docs>
+        <param name="key">To be added: an object of type 'string'</param>
+        <param name="control">To be added: an object of type 'Gtk.Widget'</param>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="ChangeSet">
+      <MemberSignature Language="C#" Value="public GConf.ChangeSet ChangeSet { set; get; }" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>GConf.ChangeSet</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>To be added.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Client">
+      <MemberSignature Language="C#" Value="public GConf.Client Client { set; get; }" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>GConf.Client</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>To be added.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="ConnectHandlers">
+      <MemberSignature Language="C#" Value="protected abstract void ConnectHandlers ();" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
@@ -28,18 +66,15 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="Set">
-      <MemberSignature Language="C#" Value="protected virtual void Set (object val);" />
-      <MemberType>Method</MemberType>
+    <Member MemberName="Control">
+      <MemberSignature Language="C#" Value="public Gtk.Widget Control { get; }" />
+      <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
+        <ReturnType>Gtk.Widget</ReturnType>
       </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="System.Object" />
-      </Parameters>
       <Docs>
         <summary>To be added</summary>
-        <param name="val">To be added: an object of type 'object'</param>
+        <value>To be added: an object of type 'Gtk.Widget'</value>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
@@ -56,8 +91,35 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="ConnectHandlers">
-      <MemberSignature Language="C#" Value="protected abstract void ConnectHandlers ();" />
+    <Member MemberName="Key">
+      <MemberSignature Language="C#" Value="public string Key { get; }" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.String</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>To be added</summary>
+        <value>To be added: an object of type 'string'</value>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Set">
+      <MemberSignature Language="C#" Value="protected virtual void Set (object val);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="val" Type="System.Object" />
+      </Parameters>
+      <Docs>
+        <param name="val">To be added: an object of type 'object'</param>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Setup">
+      <MemberSignature Language="C#" Value="public virtual void Setup ();" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
@@ -79,74 +141,11 @@
         <Parameter Name="args" Type="GConf.NotifyEventArgs" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
         <param name="sender">To be added: an object of type 'object'</param>
         <param name="args">To be added: an object of type 'GConf.NotifyEventArgs'</param>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public PropertyEditor (string key, Gtk.Widget control);" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
-      <Parameters>
-        <Parameter Name="key" Type="System.String" />
-        <Parameter Name="control" Type="Gtk.Widget" />
-      </Parameters>
-      <Docs>
         <summary>To be added</summary>
-        <param name="key">To be added: an object of type 'string'</param>
-        <param name="control">To be added: an object of type 'Gtk.Widget'</param>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="Control">
-      <MemberSignature Language="C#" Value="public Gtk.Widget Control { get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>Gtk.Widget</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>To be added</summary>
-        <value>To be added: an object of type 'Gtk.Widget'</value>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Key">
-      <MemberSignature Language="C#" Value="public string Key { get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>To be added</summary>
-        <value>To be added: an object of type 'string'</value>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Client">
-      <MemberSignature Language="C#" Value="public GConf.Client Client { set; get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>GConf.Client</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>To be added.</summary>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ChangeSet">
-      <MemberSignature Language="C#" Value="public GConf.ChangeSet ChangeSet { set; get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>GConf.ChangeSet</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>To be added.</summary>
-        <value>To be added.</value>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
   </Members>
 </Type>
diff --git a/doc/en/GConf.PropertyEditors/PropertyEditorBool.xml b/doc/en/GConf.PropertyEditors/PropertyEditorBool.xml
index d2cd263a9..bb245fa56 100644
--- a/doc/en/GConf.PropertyEditors/PropertyEditorBool.xml
+++ b/doc/en/GConf.PropertyEditors/PropertyEditorBool.xml
@@ -4,18 +4,32 @@
     <AssemblyName>gconf-sharp-peditors</AssemblyName>
     <AssemblyPublicKey>
     </AssemblyPublicKey>
-    <AssemblyVersion>2.20.0.0</AssemblyVersion>
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the &lt;link location="node:gtk-sharp/programming/threads"&gt;Gtk# Thread Programming&lt;/link&gt; for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
   <Base>
     <BaseTypeName>GConf.PropertyEditors.PropertyEditor</BaseTypeName>
   </Base>
   <Interfaces />
+  <Docs>
+    <summary>To be added</summary>
+    <remarks>To be added</remarks>
+  </Docs>
   <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public PropertyEditorBool (string key, Gtk.Widget control);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="key" Type="System.String" />
+        <Parameter Name="control" Type="Gtk.Widget" />
+      </Parameters>
+      <Docs>
+        <param name="key">To be added: an object of type 'string'</param>
+        <param name="control">To be added: an object of type 'Gtk.Widget'</param>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="AddGuard">
       <MemberSignature Language="C#" Value="public void AddGuard (Gtk.Widget control);" />
       <MemberType>Method</MemberType>
@@ -26,24 +40,24 @@
         <Parameter Name="control" Type="Gtk.Widget" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
         <param name="control">To be added: an object of type 'Gtk.Widget'</param>
+        <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public PropertyEditorBool (string key, Gtk.Widget control);" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
+    <Member MemberName="Set">
+      <MemberSignature Language="C#" Value="protected override void Set (object val);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
       <Parameters>
-        <Parameter Name="key" Type="System.String" />
-        <Parameter Name="control" Type="Gtk.Widget" />
+        <Parameter Name="val" Type="System.Object" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
-        <param name="key">To be added: an object of type 'string'</param>
-        <param name="control">To be added: an object of type 'Gtk.Widget'</param>
-        <remarks>To be added</remarks>
+        <param name="val">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/doc/en/GConf.PropertyEditors/PropertyEditorEntry.xml b/doc/en/GConf.PropertyEditors/PropertyEditorEntry.xml
index 9e9077fa1..72de19dc9 100644
--- a/doc/en/GConf.PropertyEditors/PropertyEditorEntry.xml
+++ b/doc/en/GConf.PropertyEditors/PropertyEditorEntry.xml
@@ -4,17 +4,16 @@
     <AssemblyName>gconf-sharp-peditors</AssemblyName>
     <AssemblyPublicKey>
     </AssemblyPublicKey>
-    <AssemblyVersion>2.20.0.0</AssemblyVersion>
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the &lt;link location="node:gtk-sharp/programming/threads"&gt;Gtk# Thread Programming&lt;/link&gt; for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
   <Base>
     <BaseTypeName>GConf.PropertyEditors.PropertyEditor</BaseTypeName>
   </Base>
   <Interfaces />
+  <Docs>
+    <summary>To be added</summary>
+    <remarks>To be added</remarks>
+  </Docs>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public PropertyEditorEntry (string key, Gtk.Entry entry);" />
@@ -25,11 +24,40 @@
         <Parameter Name="entry" Type="Gtk.Entry" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
         <param name="key">To be added: an object of type 'string'</param>
         <param name="entry">To be added: an object of type 'Gtk.Entry'</param>
+        <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="ConnectHandlers">
+      <MemberSignature Language="C#" Value="protected override void ConnectHandlers ();" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="ValueChanged">
+      <MemberSignature Language="C#" Value="protected override void ValueChanged (object sender, GConf.NotifyEventArgs args);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="sender" Type="System.Object" />
+        <Parameter Name="args" Type="GConf.NotifyEventArgs" />
+      </Parameters>
+      <Docs>
+        <param name="sender">To be added.</param>
+        <param name="args">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
diff --git a/doc/en/GConf.PropertyEditors/PropertyEditorEnum.xml b/doc/en/GConf.PropertyEditors/PropertyEditorEnum.xml
index 723c3b3fe..2a0b8af47 100644
--- a/doc/en/GConf.PropertyEditors/PropertyEditorEnum.xml
+++ b/doc/en/GConf.PropertyEditors/PropertyEditorEnum.xml
@@ -4,34 +4,17 @@
     <AssemblyName>gconf-sharp-peditors</AssemblyName>
     <AssemblyPublicKey>
     </AssemblyPublicKey>
-    <AssemblyVersion>2.20.0.0</AssemblyVersion>
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the &lt;link location="node:gtk-sharp/programming/threads"&gt;Gtk# Thread Programming&lt;/link&gt; for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
   <Base>
     <BaseTypeName>GConf.PropertyEditors.PropertyEditor</BaseTypeName>
   </Base>
   <Interfaces />
+  <Docs>
+    <summary>To be added</summary>
+    <remarks>To be added</remarks>
+  </Docs>
   <Members>
-    <Member MemberName="ValueToInt">
-      <MemberSignature Language="C#" Value="protected int ValueToInt (object val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int32</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="System.Object" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">To be added: an object of type 'object'</param>
-        <returns>To be added: an object of type 'int'</returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public PropertyEditorEnum (string key, Gtk.Widget control);" />
       <MemberType>Constructor</MemberType>
@@ -41,9 +24,26 @@
         <Parameter Name="control" Type="Gtk.Widget" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
         <param name="key">To be added: an object of type 'string'</param>
         <param name="control">To be added: an object of type 'Gtk.Widget'</param>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public PropertyEditorEnum (string key, Gtk.Widget control, Type enum_type);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="key" Type="System.String" />
+        <Parameter Name="control" Type="Gtk.Widget" />
+        <Parameter Name="enum_type" Type="System.Type" />
+      </Parameters>
+      <Docs>
+        <param name="key">To be added: an object of type 'string'</param>
+        <param name="control">To be added: an object of type 'Gtk.Widget'</param>
+        <param name="enum_type">To be added: an object of type 'Type'</param>
+        <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
@@ -58,28 +58,42 @@
         <Parameter Name="enum_values" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
         <param name="key">To be added: an object of type 'string'</param>
         <param name="control">To be added: an object of type 'Gtk.Widget'</param>
         <param name="enum_type">To be added: an object of type 'Type'</param>
         <param name="enum_values">To be added: an object of type 'int []'</param>
+        <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public PropertyEditorEnum (string key, Gtk.Widget control, Type enum_type);" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
+    <Member MemberName="Set">
+      <MemberSignature Language="C#" Value="protected override void Set (object val);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
       <Parameters>
-        <Parameter Name="key" Type="System.String" />
-        <Parameter Name="control" Type="Gtk.Widget" />
-        <Parameter Name="enum_type" Type="System.Type" />
+        <Parameter Name="val" Type="System.Object" />
       </Parameters>
       <Docs>
+        <param name="val">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="ValueToInt">
+      <MemberSignature Language="C#" Value="protected int ValueToInt (object val);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Int32</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="val" Type="System.Object" />
+      </Parameters>
+      <Docs>
+        <param name="val">To be added: an object of type 'object'</param>
         <summary>To be added</summary>
-        <param name="key">To be added: an object of type 'string'</param>
-        <param name="control">To be added: an object of type 'Gtk.Widget'</param>
-        <param name="enum_type">To be added: an object of type 'Type'</param>
+        <returns>To be added: an object of type 'int'</returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GConf.PropertyEditors/PropertyEditorFileEntry.xml b/doc/en/GConf.PropertyEditors/PropertyEditorFileEntry.xml
index 556efc552..3f77d9baa 100644
--- a/doc/en/GConf.PropertyEditors/PropertyEditorFileEntry.xml
+++ b/doc/en/GConf.PropertyEditors/PropertyEditorFileEntry.xml
@@ -4,17 +4,16 @@
     <AssemblyName>gconf-sharp-peditors</AssemblyName>
     <AssemblyPublicKey>
     </AssemblyPublicKey>
-    <AssemblyVersion>2.20.0.0</AssemblyVersion>
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the &lt;link location="node:gtk-sharp/programming/threads"&gt;Gtk# Thread Programming&lt;/link&gt; for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
   <Base>
     <BaseTypeName>GConf.PropertyEditors.PropertyEditor</BaseTypeName>
   </Base>
   <Interfaces />
+  <Docs>
+    <summary>To be added</summary>
+    <remarks>To be added</remarks>
+  </Docs>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public PropertyEditorFileEntry (string key, Gnome.FileEntry entry);" />
@@ -25,11 +24,40 @@
         <Parameter Name="entry" Type="Gnome.FileEntry" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
         <param name="key">To be added: an object of type 'string'</param>
         <param name="entry">To be added: an object of type 'Gnome.FileEntry'</param>
+        <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="ConnectHandlers">
+      <MemberSignature Language="C#" Value="protected override void ConnectHandlers ();" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="ValueChanged">
+      <MemberSignature Language="C#" Value="protected override void ValueChanged (object sender, GConf.NotifyEventArgs args);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="sender" Type="System.Object" />
+        <Parameter Name="args" Type="GConf.NotifyEventArgs" />
+      </Parameters>
+      <Docs>
+        <param name="sender">To be added.</param>
+        <param name="args">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
diff --git a/doc/en/GConf.PropertyEditors/PropertyEditorOptionMenu.xml b/doc/en/GConf.PropertyEditors/PropertyEditorOptionMenu.xml
index 1eca7c097..dc53bda05 100644
--- a/doc/en/GConf.PropertyEditors/PropertyEditorOptionMenu.xml
+++ b/doc/en/GConf.PropertyEditors/PropertyEditorOptionMenu.xml
@@ -4,17 +4,16 @@
     <AssemblyName>gconf-sharp-peditors</AssemblyName>
     <AssemblyPublicKey>
     </AssemblyPublicKey>
-    <AssemblyVersion>2.20.0.0</AssemblyVersion>
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the &lt;link location="node:gtk-sharp/programming/threads"&gt;Gtk# Thread Programming&lt;/link&gt; for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
   <Base>
     <BaseTypeName>GConf.PropertyEditors.PropertyEditorEnum</BaseTypeName>
   </Base>
   <Interfaces />
+  <Docs>
+    <summary>To be added</summary>
+    <remarks>To be added</remarks>
+  </Docs>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public PropertyEditorOptionMenu (string key, Gtk.OptionMenu menu);" />
@@ -25,9 +24,26 @@
         <Parameter Name="menu" Type="Gtk.OptionMenu" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
         <param name="key">To be added: an object of type 'string'</param>
         <param name="menu">To be added: an object of type 'Gtk.OptionMenu'</param>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public PropertyEditorOptionMenu (string key, Gtk.OptionMenu menu, Type enum_type);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="key" Type="System.String" />
+        <Parameter Name="menu" Type="Gtk.OptionMenu" />
+        <Parameter Name="enum_type" Type="System.Type" />
+      </Parameters>
+      <Docs>
+        <param name="key">To be added: an object of type 'string'</param>
+        <param name="menu">To be added: an object of type 'Gtk.OptionMenu'</param>
+        <param name="enum_type">To be added: an object of type 'Type'</param>
+        <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
@@ -42,29 +58,41 @@
         <Parameter Name="enum_values" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
         <param name="key">To be added: an object of type 'string'</param>
         <param name="menu">To be added: an object of type 'Gtk.OptionMenu'</param>
         <param name="enum_type">To be added: an object of type 'Type'</param>
         <param name="enum_values">To be added: an object of type 'int []'</param>
+        <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public PropertyEditorOptionMenu (string key, Gtk.OptionMenu menu, Type enum_type);" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
+    <Member MemberName="ConnectHandlers">
+      <MemberSignature Language="C#" Value="protected override void ConnectHandlers ();" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="ValueChanged">
+      <MemberSignature Language="C#" Value="protected override void ValueChanged (object sender, GConf.NotifyEventArgs args);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
       <Parameters>
-        <Parameter Name="key" Type="System.String" />
-        <Parameter Name="menu" Type="Gtk.OptionMenu" />
-        <Parameter Name="enum_type" Type="System.Type" />
+        <Parameter Name="sender" Type="System.Object" />
+        <Parameter Name="args" Type="GConf.NotifyEventArgs" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
-        <param name="key">To be added: an object of type 'string'</param>
-        <param name="menu">To be added: an object of type 'Gtk.OptionMenu'</param>
-        <param name="enum_type">To be added: an object of type 'Type'</param>
-        <remarks>To be added</remarks>
+        <param name="sender">To be added.</param>
+        <param name="args">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/doc/en/GConf.PropertyEditors/PropertyEditorRadioButton.xml b/doc/en/GConf.PropertyEditors/PropertyEditorRadioButton.xml
index 58150d082..95cccc564 100644
--- a/doc/en/GConf.PropertyEditors/PropertyEditorRadioButton.xml
+++ b/doc/en/GConf.PropertyEditors/PropertyEditorRadioButton.xml
@@ -4,17 +4,16 @@
     <AssemblyName>gconf-sharp-peditors</AssemblyName>
     <AssemblyPublicKey>
     </AssemblyPublicKey>
-    <AssemblyVersion>2.20.0.0</AssemblyVersion>
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the &lt;link location="node:gtk-sharp/programming/threads"&gt;Gtk# Thread Programming&lt;/link&gt; for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
   <Base>
     <BaseTypeName>GConf.PropertyEditors.PropertyEditorEnum</BaseTypeName>
   </Base>
   <Interfaces />
+  <Docs>
+    <summary>To be added</summary>
+    <remarks>To be added</remarks>
+  </Docs>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public PropertyEditorRadioButton (string key, Gtk.RadioButton button);" />
@@ -25,9 +24,26 @@
         <Parameter Name="button" Type="Gtk.RadioButton" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
         <param name="key">To be added: an object of type 'string'</param>
         <param name="button">To be added: an object of type 'Gtk.RadioButton'</param>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public PropertyEditorRadioButton (string key, Gtk.RadioButton button, Type enum_type);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="key" Type="System.String" />
+        <Parameter Name="button" Type="Gtk.RadioButton" />
+        <Parameter Name="enum_type" Type="System.Type" />
+      </Parameters>
+      <Docs>
+        <param name="key">To be added: an object of type 'string'</param>
+        <param name="button">To be added: an object of type 'Gtk.RadioButton'</param>
+        <param name="enum_type">To be added: an object of type 'Type'</param>
+        <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
@@ -42,29 +58,41 @@
         <Parameter Name="enum_values" Type="System.Int32[]" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
         <param name="key">To be added: an object of type 'string'</param>
         <param name="button">To be added: an object of type 'Gtk.RadioButton'</param>
         <param name="enum_type">To be added: an object of type 'Type'</param>
         <param name="enum_values">To be added: an object of type 'int []'</param>
+        <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public PropertyEditorRadioButton (string key, Gtk.RadioButton button, Type enum_type);" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
+    <Member MemberName="ConnectHandlers">
+      <MemberSignature Language="C#" Value="protected override void ConnectHandlers ();" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="ValueChanged">
+      <MemberSignature Language="C#" Value="protected override void ValueChanged (object sender, GConf.NotifyEventArgs args);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
       <Parameters>
-        <Parameter Name="key" Type="System.String" />
-        <Parameter Name="button" Type="Gtk.RadioButton" />
-        <Parameter Name="enum_type" Type="System.Type" />
+        <Parameter Name="sender" Type="System.Object" />
+        <Parameter Name="args" Type="GConf.NotifyEventArgs" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
-        <param name="key">To be added: an object of type 'string'</param>
-        <param name="button">To be added: an object of type 'Gtk.RadioButton'</param>
-        <param name="enum_type">To be added: an object of type 'Type'</param>
-        <remarks>To be added</remarks>
+        <param name="sender">To be added.</param>
+        <param name="args">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/doc/en/GConf.PropertyEditors/PropertyEditorSpinButton.xml b/doc/en/GConf.PropertyEditors/PropertyEditorSpinButton.xml
index b6ef1df20..fda4e8a04 100644
--- a/doc/en/GConf.PropertyEditors/PropertyEditorSpinButton.xml
+++ b/doc/en/GConf.PropertyEditors/PropertyEditorSpinButton.xml
@@ -4,17 +4,16 @@
     <AssemblyName>gconf-sharp-peditors</AssemblyName>
     <AssemblyPublicKey>
     </AssemblyPublicKey>
-    <AssemblyVersion>2.20.0.0</AssemblyVersion>
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the &lt;link location="node:gtk-sharp/programming/threads"&gt;Gtk# Thread Programming&lt;/link&gt; for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
   <Base>
     <BaseTypeName>GConf.PropertyEditors.PropertyEditor</BaseTypeName>
   </Base>
   <Interfaces />
+  <Docs>
+    <summary>To be added</summary>
+    <remarks>To be added</remarks>
+  </Docs>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public PropertyEditorSpinButton (string key, Gtk.SpinButton spin);" />
@@ -25,11 +24,40 @@
         <Parameter Name="spin" Type="Gtk.SpinButton" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
         <param name="key">To be added: an object of type 'string'</param>
         <param name="spin">To be added: an object of type 'Gtk.SpinButton'</param>
+        <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="ConnectHandlers">
+      <MemberSignature Language="C#" Value="protected override void ConnectHandlers ();" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="ValueChanged">
+      <MemberSignature Language="C#" Value="protected override void ValueChanged (object sender, GConf.NotifyEventArgs args);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="sender" Type="System.Object" />
+        <Parameter Name="args" Type="GConf.NotifyEventArgs" />
+      </Parameters>
+      <Docs>
+        <param name="sender">To be added.</param>
+        <param name="args">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
diff --git a/doc/en/GConf.PropertyEditors/PropertyEditorToggleButton.xml b/doc/en/GConf.PropertyEditors/PropertyEditorToggleButton.xml
index 8910fdc3d..99fb91afb 100644
--- a/doc/en/GConf.PropertyEditors/PropertyEditorToggleButton.xml
+++ b/doc/en/GConf.PropertyEditors/PropertyEditorToggleButton.xml
@@ -4,17 +4,16 @@
     <AssemblyName>gconf-sharp-peditors</AssemblyName>
     <AssemblyPublicKey>
     </AssemblyPublicKey>
-    <AssemblyVersion>2.20.0.0</AssemblyVersion>
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the &lt;link location="node:gtk-sharp/programming/threads"&gt;Gtk# Thread Programming&lt;/link&gt; for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
   <Base>
     <BaseTypeName>GConf.PropertyEditors.PropertyEditorBool</BaseTypeName>
   </Base>
   <Interfaces />
+  <Docs>
+    <summary>To be added</summary>
+    <remarks>To be added</remarks>
+  </Docs>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public PropertyEditorToggleButton (string key, Gtk.ToggleButton checkbox);" />
@@ -25,11 +24,40 @@
         <Parameter Name="checkbox" Type="Gtk.ToggleButton" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
         <param name="key">To be added: an object of type 'string'</param>
         <param name="checkbox">To be added: an object of type 'Gtk.ToggleButton'</param>
+        <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="ConnectHandlers">
+      <MemberSignature Language="C#" Value="protected override void ConnectHandlers ();" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="ValueChanged">
+      <MemberSignature Language="C#" Value="protected override void ValueChanged (object sender, GConf.NotifyEventArgs args);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="sender" Type="System.Object" />
+        <Parameter Name="args" Type="GConf.NotifyEventArgs" />
+      </Parameters>
+      <Docs>
+        <param name="sender">To be added.</param>
+        <param name="args">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
diff --git a/doc/en/GConf/ChangeSet.xml b/doc/en/GConf/ChangeSet.xml
index a6aa3cb86..68f88f2ac 100644
--- a/doc/en/GConf/ChangeSet.xml
+++ b/doc/en/GConf/ChangeSet.xml
@@ -4,13 +4,8 @@
     <AssemblyName>gconf-sharp</AssemblyName>
     <AssemblyPublicKey>
     </AssemblyPublicKey>
-    <AssemblyVersion>2.20.0.0</AssemblyVersion>
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the &lt;link location="node:gtk-sharp/programming/threads"&gt;Gtk# Thread Programming&lt;/link&gt; for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>A ChangeSet is a set of changes to the GConf database that can be commited and reversed easily.</summary>
-    <remarks>The changes can be both set and unset operations. Currently the ChangeSet operations are not atomic, and not specially optimized for. However, it is suitable for use, for instance, preferences dialogs.</remarks>
-  </Docs>
   <Base>
     <BaseTypeName>GConf.ClientBase</BaseTypeName>
   </Base>
@@ -19,7 +14,22 @@
       <InterfaceName>System.IDisposable</InterfaceName>
     </Interface>
   </Interfaces>
+  <Docs>
+    <summary>A ChangeSet is a set of changes to the GConf database that can be commited and reversed easily.</summary>
+    <remarks>The changes can be both set and unset operations. Currently the ChangeSet operations are not atomic, and not specially optimized for. However, it is suitable for use, for instance, preferences dialogs.</remarks>
+  </Docs>
   <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public ChangeSet ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters />
+      <Docs>
+        <summary>Initializes a new ChangeSet object</summary>
+        <remarks>
+        </remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Dispose">
       <MemberSignature Language="C#" Value="public void Dispose ();" />
       <MemberType>Method</MemberType>
@@ -32,15 +42,32 @@
         <remarks>Called by Finalize</remarks>
       </Docs>
     </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ChangeSet ();" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="~ChangeSet ();" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Initializes a new ChangeSet object</summary>
-        <remarks>
-        </remarks>
+        <summary>Finalizer.</summary>
+        <remarks />
+      </Docs>
+    </Member>
+    <Member MemberName="Get">
+      <MemberSignature Language="C#" Value="public override object Get (string key);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Object</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="key" Type="System.String" />
+      </Parameters>
+      <Docs>
+        <param name="key">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/doc/en/GConf/Client.xml b/doc/en/GConf/Client.xml
index b2a651b4e..91beee105 100644
--- a/doc/en/GConf/Client.xml
+++ b/doc/en/GConf/Client.xml
@@ -4,9 +4,12 @@
     <AssemblyName>gconf-sharp</AssemblyName>
     <AssemblyPublicKey>
     </AssemblyPublicKey>
-    <AssemblyVersion>2.20.0.0</AssemblyVersion>
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the &lt;link location="node:gtk-sharp/programming/threads"&gt;Gtk# Thread Programming&lt;/link&gt; for details.</ThreadSafetyStatement>
+  <Base>
+    <BaseTypeName>GConf.ClientBase</BaseTypeName>
+  </Base>
+  <Interfaces />
   <Docs>
     <summary>Basic functions to initialize GConf and get/set values.</summary>
     <remarks>The following example attempts to retrieve a setting from GConf, and set a default value otherwise.</remarks>
@@ -27,38 +30,15 @@ catch (GConf.NoSuchKeyException)
 	  </code>
     </example>
   </Docs>
-  <Base>
-    <BaseTypeName>GConf.ClientBase</BaseTypeName>
-  </Base>
-  <Interfaces />
   <Members>
-    <Member MemberName="SuggestSync">
-      <MemberSignature Language="C#" Value="public void SuggestSync ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Client ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters />
       <Docs>
-        <summary>Suggests that you have just finished a block of changes, and it would be an optimal time to sync to permanent storage.</summary>
-        <remarks>This function is just a "hint" provided to maximize efficiency and minimize data loss.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="RemoveNotify">
-      <MemberSignature Language="C#" Value="public void RemoveNotify (string dir, GConf.NotifyEventHandler notify);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="dir" Type="System.String" />
-        <Parameter Name="notify" Type="GConf.NotifyEventHandler" />
-      </Parameters>
-      <Docs>
-        <summary>Removes a notification request.</summary>
-        <param name="dir">an object of type <see cref="T:System.String" /></param>
-        <param name="notify">an object of type <see cref="T:GConf.NotifyEventHandler" /></param>
-        <remarks />
+        <summary>Creates a new <see cref="T:GConf.Client" />.</summary>
+        <remarks>This is the default constructor for <see cref="T:GConf.Client" />.</remarks>
       </Docs>
     </Member>
     <Member MemberName="AddNotify">
@@ -72,21 +52,56 @@ catch (GConf.NoSuchKeyException)
         <Parameter Name="notify" Type="GConf.NotifyEventHandler" />
       </Parameters>
       <Docs>
-        <summary>Registers a notification request.</summary>
         <param name="dir">an object of type <see cref="T:System.String" /></param>
         <param name="notify">an object of type <see cref="T:GConf.NotifyEventHandler" /></param>
+        <summary>Registers a notification request.</summary>
         <remarks>
         </remarks>
       </Docs>
     </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public Client ();" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
+    <Member MemberName="Get">
+      <MemberSignature Language="C#" Value="public override object Get (string key);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Object</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="key" Type="System.String" />
+      </Parameters>
+      <Docs>
+        <param name="key">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="RemoveNotify">
+      <MemberSignature Language="C#" Value="public void RemoveNotify (string dir, GConf.NotifyEventHandler notify);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="dir" Type="System.String" />
+        <Parameter Name="notify" Type="GConf.NotifyEventHandler" />
+      </Parameters>
+      <Docs>
+        <param name="dir">an object of type <see cref="T:System.String" /></param>
+        <param name="notify">an object of type <see cref="T:GConf.NotifyEventHandler" /></param>
+        <summary>Removes a notification request.</summary>
+        <remarks />
+      </Docs>
+    </Member>
+    <Member MemberName="SuggestSync">
+      <MemberSignature Language="C#" Value="public void SuggestSync ();" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Creates a new <see cref="T:GConf.Client" />.</summary>
-        <remarks>This is the default constructor for <see cref="T:GConf.Client" />.</remarks>
+        <summary>Suggests that you have just finished a block of changes, and it would be an optimal time to sync to permanent storage.</summary>
+        <remarks>This function is just a "hint" provided to maximize efficiency and minimize data loss.</remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/doc/en/GConf/ClientBase.xml b/doc/en/GConf/ClientBase.xml
index 8e9c26412..cbd765676 100644
--- a/doc/en/GConf/ClientBase.xml
+++ b/doc/en/GConf/ClientBase.xml
@@ -4,34 +4,26 @@
     <AssemblyName>gconf-sharp</AssemblyName>
     <AssemblyPublicKey>
     </AssemblyPublicKey>
-    <AssemblyVersion>2.20.0.0</AssemblyVersion>
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the &lt;link location="node:gtk-sharp/programming/threads"&gt;Gtk# Thread Programming&lt;/link&gt; for details.</ThreadSafetyStatement>
+  <Base>
+    <BaseTypeName>System.Object</BaseTypeName>
+  </Base>
+  <Interfaces />
   <Docs>
     <summary>Abstract class; extend this to create objects that behave
     like GConf clients.</summary>
     <remarks>
     </remarks>
   </Docs>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces />
   <Members>
-    <Member MemberName="Set">
-      <MemberSignature Language="C#" Value="public void Set (string key, object val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="key" Type="System.String" />
-        <Parameter Name="val" Type="System.Object" />
-      </Parameters>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected ClientBase ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters />
       <Docs>
-        <summary>Set the value stored at key <paramref name="key" /> to <paramref name="value" />.</summary>
-        <param name="key">a <see cref="T:System.String" /></param>
-        <param name="val">a <see cref="T:System.Object" /></param>
+        <summary>Protected constructor.</summary>
         <remarks>
         </remarks>
       </Docs>
@@ -46,20 +38,27 @@
         <Parameter Name="key" Type="System.String" />
       </Parameters>
       <Docs>
-        <summary>Get the value stored at key <paramref name="key" />.</summary>
         <param name="key">a <see cref="T:System.String" /></param>
+        <summary>Get the value stored at key <paramref name="key" />.</summary>
         <returns>a <see cref="T:System.Object" /></returns>
         <remarks>
         </remarks>
       </Docs>
     </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected ClientBase ();" />
-      <MemberType>Constructor</MemberType>
-      <ReturnValue />
-      <Parameters />
+    <Member MemberName="Set">
+      <MemberSignature Language="C#" Value="public void Set (string key, object val);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="key" Type="System.String" />
+        <Parameter Name="val" Type="System.Object" />
+      </Parameters>
       <Docs>
-        <summary>Protected constructor.</summary>
+        <param name="key">a <see cref="T:System.String" /></param>
+        <param name="val">a <see cref="T:System.Object" /></param>
+        <summary>Set the value stored at key <paramref name="key" /> to <paramref name="value" />.</summary>
         <remarks>
         </remarks>
       </Docs>
diff --git a/doc/en/GConf/Engine.xml b/doc/en/GConf/Engine.xml
index 8b988d666..e7b270da3 100644
--- a/doc/en/GConf/Engine.xml
+++ b/doc/en/GConf/Engine.xml
@@ -3,13 +3,8 @@
   <AssemblyInfo>
     <AssemblyName>gconf-sharp</AssemblyName>
     <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
-    <AssemblyVersion>2.20.0.0</AssemblyVersion>
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>Configuration Engine class.</summary>
-    <remarks />
-  </Docs>
   <Base>
     <BaseTypeName>System.Object</BaseTypeName>
   </Base>
@@ -18,7 +13,41 @@
       <InterfaceName>System.IDisposable</InterfaceName>
     </Interface>
   </Interfaces>
+  <Docs>
+    <summary>Configuration Engine class.</summary>
+    <remarks />
+  </Docs>
   <Members>
+    <Member MemberName="CommitChangeSet">
+      <MemberSignature Language="C#" Value="public void CommitChangeSet (GConf.ChangeSet cs, bool remove_committed);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="cs" Type="GConf.ChangeSet" />
+        <Parameter Name="remove_committed" Type="System.Boolean" />
+      </Parameters>
+      <Docs>
+        <param name="cs">a <see cref="T:GConf.ChangeSet" /></param>
+        <param name="remove_committed">a <see cref="T:System.Boolean" /> indicating if successfully committed items should be removed from the ChangeSet.</param>
+        <summary>Commits a change set to the engine.</summary>
+        <remarks />
+      </Docs>
+    </Member>
+    <Member MemberName="Default">
+      <MemberSignature Language="C#" Value="public static GConf.Engine Default { get; }" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>GConf.Engine</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>Gets the default configuration engine.</summary>
+        <value>a <see cref="T:GConf.Engine" /></value>
+        <remarks>This is the engine to use for most application code.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Dispose">
       <MemberSignature Language="C#" Value="public void Dispose ();" />
       <MemberType>Method</MemberType>
@@ -31,34 +60,16 @@
         <remarks />
       </Docs>
     </Member>
-    <Member MemberName="CommitChangeSet">
-      <MemberSignature Language="C#" Value="public void CommitChangeSet (GConf.ChangeSet cs, bool remove_committed);" />
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="~Engine ();" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
-      <Parameters>
-        <Parameter Name="cs" Type="GConf.ChangeSet" />
-        <Parameter Name="remove_committed" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <summary>Commits a change set to the engine.</summary>
-        <param name="cs">a <see cref="T:GConf.ChangeSet" /></param>
-        <param name="remove_committed">a <see cref="T:System.Boolean" /> indicating if successfully committed items should be removed from the ChangeSet.</param>
-        <remarks />
-      </Docs>
-    </Member>
-    <Member MemberName="Default">
-      <MemberSignature Language="C#" Value="public static GConf.Engine Default { get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>GConf.Engine</ReturnType>
-      </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Gets the default configuration engine.</summary>
-        <value>a <see cref="T:GConf.Engine" /></value>
-        <remarks>This is the engine to use for most application code.</remarks>
+        <summary>Finalizer.</summary>
+        <remarks />
       </Docs>
     </Member>
     <Member MemberName="ReverseChangeSet">
@@ -71,8 +82,8 @@
         <Parameter Name="cs" Type="GConf.ChangeSet" />
       </Parameters>
       <Docs>
-        <summary>Reverses the values for a ChangeSet.</summary>
         <param name="cs">a <see cref="T:GConf.ChangeSet" /></param>
+        <summary>Reverses the values for a ChangeSet.</summary>
         <returns>a <see cref="T:GConf.ChangeSet" /> containing the keys/values reversed from non-default values.</returns>
         <remarks />
       </Docs>
diff --git a/doc/en/GConf/NoSuchKeyException.xml b/doc/en/GConf/NoSuchKeyException.xml
index f47394763..e9072e601 100644
--- a/doc/en/GConf/NoSuchKeyException.xml
+++ b/doc/en/GConf/NoSuchKeyException.xml
@@ -4,18 +4,17 @@
     <AssemblyName>gconf-sharp</AssemblyName>
     <AssemblyPublicKey>
     </AssemblyPublicKey>
-    <AssemblyVersion>2.20.0.0</AssemblyVersion>
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the &lt;link location="node:gtk-sharp/programming/threads"&gt;Gtk# Thread Programming&lt;/link&gt; for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>This Exception is thrown when a key is not found in the user GConf file</summary>
-    <remarks>This exception is thrown by the Get methods of the ChangeSet and Client classes when a value is requested for a key that does not exist.</remarks>
-  </Docs>
   <Base>
     <BaseTypeName>System.Exception</BaseTypeName>
   </Base>
   <Interfaces>
   </Interfaces>
+  <Docs>
+    <summary>This Exception is thrown when a key is not found in the user GConf file</summary>
+    <remarks>This exception is thrown by the Get methods of the ChangeSet and Client classes when a value is requested for a key that does not exist.</remarks>
+  </Docs>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public NoSuchKeyException ();" />
@@ -36,8 +35,8 @@
         <Parameter Name="key" Type="System.String" />
       </Parameters>
       <Docs>
-        <summary>Public constructor.</summary>
         <param name="key">a <see cref="T:System.String" />, name of the key that was not found.</param>
+        <summary>Public constructor.</summary>
         <remarks>
         </remarks>
       </Docs>
diff --git a/doc/en/GConf/NotifyEventArgs.xml b/doc/en/GConf/NotifyEventArgs.xml
index fd28985f8..c07e2ab77 100644
--- a/doc/en/GConf/NotifyEventArgs.xml
+++ b/doc/en/GConf/NotifyEventArgs.xml
@@ -4,18 +4,17 @@
     <AssemblyName>gconf-sharp</AssemblyName>
     <AssemblyPublicKey>
     </AssemblyPublicKey>
-    <AssemblyVersion>2.20.0.0</AssemblyVersion>
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the &lt;link location="node:gtk-sharp/programming/threads"&gt;Gtk# Thread Programming&lt;/link&gt; for details.</ThreadSafetyStatement>
+  <Base>
+    <BaseTypeName>System.EventArgs</BaseTypeName>
+  </Base>
+  <Interfaces />
   <Docs>
     <summary>Arguments of the GConf Notify event that was called due to a GConf key being added, removed or updated.</summary>
     <remarks>
     </remarks>
   </Docs>
-  <Base>
-    <BaseTypeName>System.EventArgs</BaseTypeName>
-  </Base>
-  <Interfaces />
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public NotifyEventArgs (string key, object val);" />
@@ -26,14 +25,27 @@
         <Parameter Name="val" Type="System.Object" />
       </Parameters>
       <Docs>
-        <summary>This constructor is called to initialize a NotifyEventArgs with the key/value that was updated, removed or added in GConf</summary>
         <param name="key">a <see cref="T:System.String" /></param>
         <param name="val">a <see cref="T:System.Object" /></param>
+        <summary>This constructor is called to initialize a NotifyEventArgs with the key/value that was updated, removed or added in GConf</summary>
         <remarks />
       </Docs>
     </Member>
+    <Member MemberName="Key">
+      <MemberSignature Language="C#" Value="public string Key { get; }" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.String</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>This NotifyEventArgs property refers to the key which value modification, addition or removal cause the event to be raised.</summary>
+        <value>a string for the key name</value>
+        <remarks>
+        </remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Value">
-      <MemberSignature Language="C#" Value="public object Value { get; };" />
+      <MemberSignature Language="C#" Value="public object Value { get; }" />
       <MemberType>Property</MemberType>
       <ReturnValue>
         <ReturnType>System.Object</ReturnType>
@@ -46,18 +58,5 @@
         </remarks>
       </Docs>
     </Member>
-    <Member MemberName="Key">
-      <MemberSignature Language="C#" Value="public string Key { get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>This NotifyEventArgs property refers to the key which value modification, addition or removal cause the event to be raised.</summary>
-        <value>a string for the key name</value>
-        <remarks>
-        </remarks>
-      </Docs>
-    </Member>
   </Members>
 </Type>
diff --git a/doc/en/GConf/NotifyEventHandler.xml b/doc/en/GConf/NotifyEventHandler.xml
index debb9aaf8..69abce64f 100644
--- a/doc/en/GConf/NotifyEventHandler.xml
+++ b/doc/en/GConf/NotifyEventHandler.xml
@@ -3,9 +3,11 @@
   <AssemblyInfo>
     <AssemblyName>gconf-sharp</AssemblyName>
     <AssemblyPublicKey />
-    <AssemblyVersion>2.20.0.0</AssemblyVersion>
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
+  <Base>
+    <BaseTypeName>System.Delegate</BaseTypeName>
+  </Base>
   <Docs>
     <param name="sender">To be added.</param>
     <param name="args">To be added.</param>
@@ -15,9 +17,6 @@
   </code></example>
 This is very important for graphic interfaces, as it is a good practice to make the application react instantly to preference changes.</remarks>
   </Docs>
-  <Base>
-    <BaseTypeName>System.Delegate</BaseTypeName>
-  </Base>
   <Members />
   <ReturnValue>
     <ReturnType>System.Void</ReturnType>
diff --git a/doc/en/GConf.PropertyEditors.xml b/doc/en/ns-GConf.PropertyEditors.xml
similarity index 100%
rename from doc/en/GConf.PropertyEditors.xml
rename to doc/en/ns-GConf.PropertyEditors.xml
diff --git a/doc/en/GConf.xml b/doc/en/ns-GConf.xml
similarity index 100%
rename from doc/en/GConf.xml
rename to doc/en/ns-GConf.xml