diff --git a/doc/en/GConf.PropertyEditors/EditorNotSupportedException.xml b/doc/en/GConf.PropertyEditors/EditorNotSupportedException.xml
index 3a168ff79..af43b996b 100644
--- a/doc/en/GConf.PropertyEditors/EditorNotSupportedException.xml
+++ b/doc/en/GConf.PropertyEditors/EditorNotSupportedException.xml
@@ -1,5 +1,5 @@
 <Type Name="EditorNotSupportedException" FullName="GConf.PropertyEditors.EditorNotSupportedException">
-  <TypeSignature Language="C#" Maintainer="auto" Value="public class EditorNotSupportedException : System.Exception" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public class EditorNotSupportedException : Exception" />
   <AssemblyInfo>
     <AssemblyName>gconf-sharp-peditors</AssemblyName>
     <AssemblyPublicKey>
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>System.Exception</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public EditorNotSupportedException ();" />
diff --git a/doc/en/GConf.PropertyEditors/InvalidGladeKeyException.xml b/doc/en/GConf.PropertyEditors/InvalidGladeKeyException.xml
index 6c0a06df6..932b2ab2a 100644
--- a/doc/en/GConf.PropertyEditors/InvalidGladeKeyException.xml
+++ b/doc/en/GConf.PropertyEditors/InvalidGladeKeyException.xml
@@ -1,5 +1,5 @@
 <Type Name="InvalidGladeKeyException" FullName="GConf.PropertyEditors.InvalidGladeKeyException">
-  <TypeSignature Language="C#" Maintainer="auto" Value="public class InvalidGladeKeyException : System.Exception" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public class InvalidGladeKeyException : Exception" />
   <AssemblyInfo>
     <AssemblyName>gconf-sharp-peditors</AssemblyName>
     <AssemblyPublicKey>
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>System.Exception</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public InvalidGladeKeyException (string control_name);" />
diff --git a/doc/en/GConf/ChangeSet.xml b/doc/en/GConf/ChangeSet.xml
index 04277322e..0a849b4aa 100644
--- a/doc/en/GConf/ChangeSet.xml
+++ b/doc/en/GConf/ChangeSet.xml
@@ -1,5 +1,5 @@
 <Type Name="ChangeSet" FullName="GConf.ChangeSet">
-  <TypeSignature Language="C#" Maintainer="auto" Value="public class ChangeSet : GConf.ClientBase, System.IDisposable" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public class ChangeSet : GConf.ClientBase, IDisposable" />
   <AssemblyInfo>
     <AssemblyName>gconf-sharp</AssemblyName>
     <AssemblyPublicKey>
diff --git a/doc/en/GConf/Engine.xml b/doc/en/GConf/Engine.xml
index 54bfe0686..35794e726 100644
--- a/doc/en/GConf/Engine.xml
+++ b/doc/en/GConf/Engine.xml
@@ -1,5 +1,5 @@
 <Type Name="Engine" FullName="GConf.Engine">
-  <TypeSignature Language="C#" Maintainer="auto" Value="public class Engine : System.IDisposable" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public class Engine : IDisposable" />
   <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>
diff --git a/doc/en/GConf/NoSuchKeyException.xml b/doc/en/GConf/NoSuchKeyException.xml
index f9cd3c6c9..d77e135b4 100644
--- a/doc/en/GConf/NoSuchKeyException.xml
+++ b/doc/en/GConf/NoSuchKeyException.xml
@@ -1,5 +1,5 @@
 <Type Name="NoSuchKeyException" FullName="GConf.NoSuchKeyException">
-  <TypeSignature Language="C#" Maintainer="auto" Value="public class NoSuchKeyException : System.Exception" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public class NoSuchKeyException : Exception" />
   <AssemblyInfo>
     <AssemblyName>gconf-sharp</AssemblyName>
     <AssemblyPublicKey>
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>System.Exception</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public NoSuchKeyException ();" />
diff --git a/doc/en/GConf/NotifyEventArgs.xml b/doc/en/GConf/NotifyEventArgs.xml
index eacf51f43..69431c2ce 100644
--- a/doc/en/GConf/NotifyEventArgs.xml
+++ b/doc/en/GConf/NotifyEventArgs.xml
@@ -1,5 +1,5 @@
 <Type Name="NotifyEventArgs" FullName="GConf.NotifyEventArgs">
-  <TypeSignature Language="C#" Value="public class NotifyEventArgs : System.EventArgs" Maintainer="auto" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public class NotifyEventArgs : EventArgs" />
   <AssemblyInfo>
     <AssemblyName>gconf-sharp</AssemblyName>
     <AssemblyPublicKey>
diff --git a/doc/en/GConf/NotifyEventHandler.xml b/doc/en/GConf/NotifyEventHandler.xml
index 189cf1dc8..2a981ffed 100644
--- a/doc/en/GConf/NotifyEventHandler.xml
+++ b/doc/en/GConf/NotifyEventHandler.xml
@@ -1,5 +1,5 @@
 <Type Name="NotifyEventHandler" FullName="GConf.NotifyEventHandler">
-  <TypeSignature Language="C#" Maintainer="auto" Value="public delegate void NotifyEventHandler(object sender, GConf.NotifyEventArgs args);" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public delegate void NotifyEventHandler(object sender, NotifyEventArgs args);" />
   <AssemblyInfo>
     <AssemblyName>gconf-sharp</AssemblyName>
     <AssemblyPublicKey />
@@ -11,10 +11,8 @@
     <param name="args">To be added.</param>
     <summary>NotifyEventHandler is a delegate object that can be used to notify your program whenever a key's value is changed, either in your program or externally (i.e. via gconf-editor).</summary>
     <remarks>You only have to attach a GConf.NotifyEventHandler delegate to a key, this way:
-<example>
-        <code lang="C#">gconfClient.AddNotify (key, new GConf.NotifyEventHandler(function));
-  </code>
-      </example>
+<example><code lang="C#">gconfClient.AddNotify (key, new GConf.NotifyEventHandler(function));
+  </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>