diff --git a/doc/en/GLib/Argv.xml b/doc/en/GLib/Argv.xml
index 25ccf6852..060b438a6 100644
--- a/doc/en/GLib/Argv.xml
+++ b/doc/en/GLib/Argv.xml
@@ -10,11 +10,9 @@
     <summary>Argv marshaling class.</summary>
     <remarks>Argv class is used to get the arguments passed to the program from the command line.
 
-<example>
-        <code lang="shell">
+<example><code lang="shell">
    $mono hello.exe 1 2 3 4
-  </code>
-      </example>
+  </code></example>
 
 Then you application [hello.exe] will be able to access these arguments passed from the command line,
 [1,2,3,4 in this case] using the Glib.Argv class.
diff --git a/doc/en/GLib/Boxed.xml b/doc/en/GLib/Boxed.xml
index 46ae7fd64..0cc7e17c5 100644
--- a/doc/en/GLib/Boxed.xml
+++ b/doc/en/GLib/Boxed.xml
@@ -17,7 +17,7 @@
   <Interfaces />
   <Attributes>
     <Attribute>
-      <AttributeName>System.Obsolete(Message=null, IsError=False)</AttributeName>
+      <AttributeName>System.Obsolete</AttributeName>
     </Attribute>
   </Attributes>
   <Members>
diff --git a/doc/en/GLib/CDeclCallbackAttribute.xml b/doc/en/GLib/CDeclCallbackAttribute.xml
index a306382a3..0508ec9f7 100644
--- a/doc/en/GLib/CDeclCallbackAttribute.xml
+++ b/doc/en/GLib/CDeclCallbackAttribute.xml
@@ -1,5 +1,5 @@
 <Type Name="CDeclCallbackAttribute" FullName="GLib.CDeclCallbackAttribute">
-  <TypeSignature Language="C#" Value="public sealed class CDeclCallbackAttribute : System.Attribute" Maintainer="auto" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public sealed class CDeclCallbackAttribute : Attribute" />
   <AssemblyInfo>
     <AssemblyName>glib-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/GLib/ClassInitializerAttribute.xml b/doc/en/GLib/ClassInitializerAttribute.xml
index ee3d5a0a2..0c6b7194d 100644
--- a/doc/en/GLib/ClassInitializerAttribute.xml
+++ b/doc/en/GLib/ClassInitializerAttribute.xml
@@ -1,5 +1,5 @@
 <Type Name="ClassInitializerAttribute" FullName="GLib.ClassInitializerAttribute">
-  <TypeSignature Language="C#" Value="public sealed class ClassInitializerAttribute : System.Attribute" Maintainer="auto" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public sealed class ClassInitializerAttribute : Attribute" />
   <AssemblyInfo>
     <AssemblyName>glib-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/GLib/ConnectBeforeAttribute.xml b/doc/en/GLib/ConnectBeforeAttribute.xml
index ce40b957f..62e187635 100644
--- a/doc/en/GLib/ConnectBeforeAttribute.xml
+++ b/doc/en/GLib/ConnectBeforeAttribute.xml
@@ -1,5 +1,5 @@
 <Type Name="ConnectBeforeAttribute" FullName="GLib.ConnectBeforeAttribute">
-  <TypeSignature Language="C#" Value="public sealed class ConnectBeforeAttribute : System.Attribute" Maintainer="auto" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public sealed class ConnectBeforeAttribute : Attribute" />
   <AssemblyInfo>
     <AssemblyName>glib-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/GLib/DefaultSignalHandlerAttribute.xml b/doc/en/GLib/DefaultSignalHandlerAttribute.xml
index 6fb985313..85385c72d 100644
--- a/doc/en/GLib/DefaultSignalHandlerAttribute.xml
+++ b/doc/en/GLib/DefaultSignalHandlerAttribute.xml
@@ -1,5 +1,5 @@
 <Type Name="DefaultSignalHandlerAttribute" FullName="GLib.DefaultSignalHandlerAttribute">
-  <TypeSignature Language="C#" Value="public sealed class DefaultSignalHandlerAttribute : System.Attribute" Maintainer="auto" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public sealed class DefaultSignalHandlerAttribute : Attribute" />
   <AssemblyInfo>
     <AssemblyName>glib-sharp</AssemblyName>
     <AssemblyPublicKey>
diff --git a/doc/en/GLib/DelegateWrapper.xml b/doc/en/GLib/DelegateWrapper.xml
index d1eba146f..251071970 100644
--- a/doc/en/GLib/DelegateWrapper.xml
+++ b/doc/en/GLib/DelegateWrapper.xml
@@ -31,7 +31,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Callback wrappers should be manually managed for persistence.", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Callback wrappers should be manually managed for persistence.")</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
diff --git a/doc/en/GLib/EnumWrapper.xml b/doc/en/GLib/EnumWrapper.xml
index 4b628137a..fae461d13 100644
--- a/doc/en/GLib/EnumWrapper.xml
+++ b/doc/en/GLib/EnumWrapper.xml
@@ -64,7 +64,7 @@
   </Members>
   <Attributes>
     <Attribute>
-      <AttributeName>System.Obsolete(Message="Replaced by direct enum type casts to/from GLib.Value", IsError=False)</AttributeName>
+      <AttributeName>System.Obsolete("Replaced by direct enum type casts to/from GLib.Value")</AttributeName>
     </Attribute>
   </Attributes>
 </Type>
diff --git a/doc/en/GLib/GException.xml b/doc/en/GLib/GException.xml
index 4db4fa7a6..166e77c25 100644
--- a/doc/en/GLib/GException.xml
+++ b/doc/en/GLib/GException.xml
@@ -1,5 +1,5 @@
 <Type Name="GException" FullName="GLib.GException">
-  <TypeSignature Language="C#" Maintainer="auto" Value="public class GException : System.Exception" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public class GException : Exception" />
   <AssemblyInfo>
     <AssemblyName>glib-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 GException (IntPtr errptr);" />
diff --git a/doc/en/GLib/GType.xml b/doc/en/GLib/GType.xml
index 696e0b3a0..d70a225f3 100644
--- a/doc/en/GLib/GType.xml
+++ b/doc/en/GLib/GType.xml
@@ -266,8 +266,7 @@
         <param name="val">a <see cref="T:System.IntPtr" /></param>
         <remarks>Generated code from gnome/generated/About.cs:
 
-<example>
-            <code lang="C#">
+<example><code lang="C#">
                 [DllImport("gnomeui-2")]
                 static extern IntPtr gnome_about_get_type();
                                                                                                                         
@@ -279,8 +278,7 @@
                         }
                 }
 
-  </code>
-          </example></remarks>
+  </code></example></remarks>
       </Docs>
     </Member>
     <Member MemberName="Val">
diff --git a/doc/en/GLib/GTypeAttribute.xml b/doc/en/GLib/GTypeAttribute.xml
index 9bf20f8d9..a205cf709 100644
--- a/doc/en/GLib/GTypeAttribute.xml
+++ b/doc/en/GLib/GTypeAttribute.xml
@@ -1,5 +1,5 @@
 <Type Name="GTypeAttribute" FullName="GLib.GTypeAttribute">
-  <TypeSignature Language="C#" Value="public sealed class GTypeAttribute : System.Attribute" Maintainer="auto" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public sealed class GTypeAttribute : Attribute" />
   <AssemblyInfo>
     <AssemblyName>glib-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>
@@ -17,7 +17,7 @@
   <Interfaces />
   <Attributes>
     <Attribute>
-      <AttributeName>System.AttributeUsage(AllowMultiple=False, Inherited=True, ValidOn=System.AttributeTargets.Enum)</AttributeName>
+      <AttributeName>System.AttributeUsage(System.AttributeTargets.Enum)</AttributeName>
     </Attribute>
   </Attributes>
   <Members>
diff --git a/doc/en/GLib/IdleHandler.xml b/doc/en/GLib/IdleHandler.xml
index 096a7a856..23374db7b 100644
--- a/doc/en/GLib/IdleHandler.xml
+++ b/doc/en/GLib/IdleHandler.xml
@@ -21,7 +21,8 @@
     <BaseTypeName>System.Delegate</BaseTypeName>
   </Base>
   <Members />
-  <Parameters></Parameters>
+  <Parameters>
+  </Parameters>
   <ReturnValue>
     <ReturnType>System.Boolean</ReturnType>
   </ReturnValue>
diff --git a/doc/en/GLib/InitiallyUnowned.xml b/doc/en/GLib/InitiallyUnowned.xml
index 2afc85d0f..08273f3d2 100644
--- a/doc/en/GLib/InitiallyUnowned.xml
+++ b/doc/en/GLib/InitiallyUnowned.xml
@@ -26,7 +26,7 @@
       <MemberType>Constructor</MemberType>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message=null, IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete</AttributeName>
         </Attribute>
       </Attributes>
       <Parameters>
diff --git a/doc/en/GLib/List.xml b/doc/en/GLib/List.xml
index 13014c532..572c69bf5 100644
--- a/doc/en/GLib/List.xml
+++ b/doc/en/GLib/List.xml
@@ -44,7 +44,8 @@
   <Base>
     <BaseTypeName>GLib.ListBase</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public List (IntPtr raw);" />
diff --git a/doc/en/GLib/ListBase+FilenameString.xml b/doc/en/GLib/ListBase+FilenameString.xml
index 567bb4a93..c2d373b94 100644
--- a/doc/en/GLib/ListBase+FilenameString.xml
+++ b/doc/en/GLib/ListBase+FilenameString.xml
@@ -1,5 +1,5 @@
 <Type Name="ListBase+FilenameString" FullName="GLib.ListBase+FilenameString">
-  <TypeSignature Language="C#" Value="public class FilenameString" />
+  <TypeSignature Language="C#" Value="public class ListBase.FilenameString" />
   <AssemblyInfo>
     <AssemblyName>glib-sharp</AssemblyName>
     <AssemblyVersion>2.10.0.0</AssemblyVersion>
diff --git a/doc/en/GLib/ListBase.xml b/doc/en/GLib/ListBase.xml
index 671d71874..8a6debdd0 100644
--- a/doc/en/GLib/ListBase.xml
+++ b/doc/en/GLib/ListBase.xml
@@ -1,5 +1,5 @@
 <Type Name="ListBase" FullName="GLib.ListBase">
-  <TypeSignature Language="C#" Maintainer="auto" Value="public abstract class ListBase : GLib.IWrapper, System.Collections.ICollection, System.ICloneable, System.IDisposable" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public abstract class ListBase : GLib.IWrapper, ICloneable, IDisposable, System.Collections.ICollection" />
   <AssemblyInfo>
     <AssemblyName>glib-sharp</AssemblyName>
     <AssemblyPublicKey>
@@ -31,7 +31,7 @@
   </Interfaces>
   <Attributes>
     <Attribute>
-      <AttributeName>System.Reflection.DefaultMember(MemberName="Item")</AttributeName>
+      <AttributeName>System.Reflection.DefaultMember("Item")</AttributeName>
     </Attribute>
   </Attributes>
   <Members>
@@ -201,7 +201,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Replaced by owned parameter on ctor.", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Replaced by owned parameter on ctor.")</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
@@ -235,7 +235,7 @@
       </Docs>
     </Member>
     <Member MemberName="Item">
-      <MemberSignature Language="C#" Value="public object Item[int index] { get; };" />
+      <MemberSignature Language="C#" Value="public object this[int index] { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
         <ReturnType>System.Object</ReturnType>
diff --git a/doc/en/GLib/LogFunc.xml b/doc/en/GLib/LogFunc.xml
index 46ef3aabf..5eae274ef 100644
--- a/doc/en/GLib/LogFunc.xml
+++ b/doc/en/GLib/LogFunc.xml
@@ -1,5 +1,5 @@
 <Type Name="LogFunc" FullName="GLib.LogFunc">
-  <TypeSignature Language="C#" Maintainer="auto" Value="public delegate void LogFunc(string log_domain, GLib.LogLevelFlags log_level, string message);" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public delegate void LogFunc(string log_domain, LogLevelFlags log_level, string message);" />
   <AssemblyInfo>
     <AssemblyName>glib-sharp</AssemblyName>
     <AssemblyVersion>2.10.0.0</AssemblyVersion>
diff --git a/doc/en/GLib/MissingIntPtrCtorException.xml b/doc/en/GLib/MissingIntPtrCtorException.xml
index e038a7d3e..499c3c5c7 100644
--- a/doc/en/GLib/MissingIntPtrCtorException.xml
+++ b/doc/en/GLib/MissingIntPtrCtorException.xml
@@ -1,5 +1,5 @@
 <Type Name="MissingIntPtrCtorException" FullName="GLib.MissingIntPtrCtorException">
-  <TypeSignature Language="C#" Maintainer="auto" Value="public class MissingIntPtrCtorException : System.Exception" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public class MissingIntPtrCtorException : Exception" />
   <AssemblyInfo>
     <AssemblyName>glib-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>
@@ -13,7 +13,8 @@
   <Base>
     <BaseTypeName>System.Exception</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public MissingIntPtrCtorException (string msg);" />
diff --git a/doc/en/GLib/NotifyHandler.xml b/doc/en/GLib/NotifyHandler.xml
index f33c11c40..0606eb0a4 100644
--- a/doc/en/GLib/NotifyHandler.xml
+++ b/doc/en/GLib/NotifyHandler.xml
@@ -1,5 +1,5 @@
 <Type Name="NotifyHandler" FullName="GLib.NotifyHandler">
-  <TypeSignature Language="C#" Maintainer="auto" Value="public delegate void NotifyHandler(object o, GLib.NotifyArgs args);" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public delegate void NotifyHandler(object o, NotifyArgs args);" />
   <AssemblyInfo>
     <AssemblyName>glib-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/GLib/Object.xml b/doc/en/GLib/Object.xml
index b63d161ae..38bcdfcf3 100644
--- a/doc/en/GLib/Object.xml
+++ b/doc/en/GLib/Object.xml
@@ -1,5 +1,5 @@
 <Type Name="Object" FullName="GLib.Object">
-  <TypeSignature Language="C#" Maintainer="auto" Value="public class Object : GLib.IWrapper, System.IDisposable" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public class Object : GLib.IWrapper, IDisposable" />
   <AssemblyInfo>
     <AssemblyName>glib-sharp</AssemblyName>
     <AssemblyPublicKey>
@@ -82,7 +82,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Can cause instability due to garbage collection of GLib.Objects.", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Can cause instability due to garbage collection of GLib.Objects.")</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
@@ -172,7 +172,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message=null, IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
@@ -201,7 +201,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Replaced by GLib.Signal marshaling mechanism.", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Replaced by GLib.Signal marshaling mechanism.")</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
@@ -218,7 +218,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Replaced by GLib.Signal marshaling mechanism.", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Replaced by GLib.Signal marshaling mechanism.")</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
@@ -235,7 +235,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Replaced by GLib.Signal marshaling mechanism.", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Replaced by GLib.Signal marshaling mechanism.")</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
@@ -252,7 +252,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Replaced by GLib.Signal marshaling mechanism.", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Replaced by GLib.Signal marshaling mechanism.")</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
diff --git a/doc/en/GLib/Opaque.xml b/doc/en/GLib/Opaque.xml
index a04b3f5cf..52cc6e1ca 100644
--- a/doc/en/GLib/Opaque.xml
+++ b/doc/en/GLib/Opaque.xml
@@ -1,5 +1,5 @@
 <Type Name="Opaque" FullName="GLib.Opaque">
-  <TypeSignature Language="C#" Maintainer="auto" Value="public class Opaque : GLib.IWrapper, System.IDisposable" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public class Opaque : GLib.IWrapper, IDisposable" />
   <AssemblyInfo>
     <AssemblyName>glib-sharp</AssemblyName>
     <AssemblyPublicKey>
diff --git a/doc/en/GLib/PropertyAttribute.xml b/doc/en/GLib/PropertyAttribute.xml
index 0500a16f8..5464f07f7 100644
--- a/doc/en/GLib/PropertyAttribute.xml
+++ b/doc/en/GLib/PropertyAttribute.xml
@@ -1,5 +1,5 @@
 <Type Name="PropertyAttribute" FullName="GLib.PropertyAttribute">
-  <TypeSignature Language="C#" Value="public sealed class PropertyAttribute : System.Attribute" Maintainer="auto" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public sealed class PropertyAttribute : Attribute" />
   <AssemblyInfo>
     <AssemblyName>glib-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/GLib/SList.xml b/doc/en/GLib/SList.xml
index ae4feeac7..ffcf9f199 100644
--- a/doc/en/GLib/SList.xml
+++ b/doc/en/GLib/SList.xml
@@ -15,7 +15,8 @@
   <Base>
     <BaseTypeName>GLib.ListBase</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public SList (IntPtr raw);" />
diff --git a/doc/en/GLib/SignalArgs.xml b/doc/en/GLib/SignalArgs.xml
index a1042374b..3d191ff24 100644
--- a/doc/en/GLib/SignalArgs.xml
+++ b/doc/en/GLib/SignalArgs.xml
@@ -1,5 +1,5 @@
 <Type Name="SignalArgs" FullName="GLib.SignalArgs">
-  <TypeSignature Language="C#" Value="public class SignalArgs : System.EventArgs" Maintainer="auto" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public class SignalArgs : EventArgs" />
   <AssemblyInfo>
     <AssemblyName>glib-sharp</AssemblyName>
     <AssemblyPublicKey>
diff --git a/doc/en/GLib/SignalAttribute.xml b/doc/en/GLib/SignalAttribute.xml
index 9f3f77e7f..1c1fc2fc5 100644
--- a/doc/en/GLib/SignalAttribute.xml
+++ b/doc/en/GLib/SignalAttribute.xml
@@ -1,5 +1,5 @@
 <Type Name="SignalAttribute" FullName="GLib.SignalAttribute">
-  <TypeSignature Language="C#" Maintainer="auto" Value="public sealed class SignalAttribute : System.Attribute" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public sealed class SignalAttribute : Attribute" />
   <AssemblyInfo>
     <AssemblyName>glib-sharp</AssemblyName>
     <AssemblyPublicKey>
@@ -54,7 +54,7 @@ public event System.EventHandler Destroyed {  add; remove; }
   </Members>
   <Attributes>
     <Attribute>
-      <AttributeName>System.AttributeUsage(AllowMultiple=False, Inherited=False, ValidOn=System.AttributeTargets.Event)</AttributeName>
+      <AttributeName>System.AttributeUsage(System.AttributeTargets.Event, Inherited=false)</AttributeName>
     </Attribute>
   </Attributes>
 </Type>
diff --git a/doc/en/GLib/SignalCallback.xml b/doc/en/GLib/SignalCallback.xml
index bd8c4e6bf..e326a0133 100644
--- a/doc/en/GLib/SignalCallback.xml
+++ b/doc/en/GLib/SignalCallback.xml
@@ -1,5 +1,5 @@
 <Type Name="SignalCallback" FullName="GLib.SignalCallback">
-  <TypeSignature Language="C#" Maintainer="auto" Value="public abstract class SignalCallback : System.IDisposable" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public abstract class SignalCallback : IDisposable" />
   <AssemblyInfo>
     <AssemblyName>glib-sharp</AssemblyName>
     <AssemblyPublicKey>
@@ -22,7 +22,7 @@
   </Interfaces>
   <Attributes>
     <Attribute>
-      <AttributeName>System.Obsolete(Message="Replaced by GLib.Signal.", IsError=False)</AttributeName>
+      <AttributeName>System.Obsolete("Replaced by GLib.Signal.")</AttributeName>
     </Attribute>
   </Attributes>
   <Members>
diff --git a/doc/en/GLib/Timeout.xml b/doc/en/GLib/Timeout.xml
index ee33557e5..e5363cb73 100644
--- a/doc/en/GLib/Timeout.xml
+++ b/doc/en/GLib/Timeout.xml
@@ -14,8 +14,7 @@ You can use timeouts to invoke routines at specified intervals of time.
 The diferance between GLib.Timeout and System.Windows.Forms.Timer is that Timeouts are always invoked on the thread that owns the Gtk mainloop
 
 
-<example>
-        <code lang="C#">
+<example><code lang="C#">
 	void StartClock () 
 	{
 		GLib.Timeout.Add(1000, new GLib.TimeoutHandler(update_status));
@@ -29,8 +28,7 @@ The diferance between GLib.Timeout and System.Windows.Forms.Timer is that Timeou
 		//terminate the timeout.
 		return true;
 	}
-  </code>
-      </example></summary>
+  </code></example></summary>
     <remarks>Use the <see cref="M:GLib.Timeout.Add" /> method to install timeout handlers into the mainloop.</remarks>
   </Docs>
   <Base>
diff --git a/doc/en/GLib/TimeoutHandler.xml b/doc/en/GLib/TimeoutHandler.xml
index 6220f61fb..109f599cf 100644
--- a/doc/en/GLib/TimeoutHandler.xml
+++ b/doc/en/GLib/TimeoutHandler.xml
@@ -14,7 +14,8 @@
     <BaseTypeName>System.Delegate</BaseTypeName>
   </Base>
   <Members />
-  <Parameters></Parameters>
+  <Parameters>
+  </Parameters>
   <ReturnValue>
     <ReturnType>System.Boolean</ReturnType>
   </ReturnValue>
diff --git a/doc/en/GLib/UnwrappedObject.xml b/doc/en/GLib/UnwrappedObject.xml
index 6906a5c3a..01a1bbe8e 100644
--- a/doc/en/GLib/UnwrappedObject.xml
+++ b/doc/en/GLib/UnwrappedObject.xml
@@ -48,7 +48,7 @@
   </Members>
   <Attributes>
     <Attribute>
-      <AttributeName>System.Obsolete(Message="Replaced by direct object-type casts to/from GLib.Value", IsError=False)</AttributeName>
+      <AttributeName>System.Obsolete("Replaced by direct object-type casts to/from GLib.Value")</AttributeName>
     </Attribute>
   </Attributes>
 </Type>
diff --git a/doc/en/GLib/Value.xml b/doc/en/GLib/Value.xml
index 3ecae122b..c831549fb 100644
--- a/doc/en/GLib/Value.xml
+++ b/doc/en/GLib/Value.xml
@@ -1,5 +1,5 @@
 <Type Name="Value" FullName="GLib.Value">
-  <TypeSignature Language="C#" Maintainer="auto" Value="public struct Value" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public struct Value : IDisposable" />
   <AssemblyInfo>
     <AssemblyName>glib-sharp</AssemblyName>
     <AssemblyPublicKey>
@@ -192,7 +192,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message=null, IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
@@ -283,7 +283,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message=null, IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
@@ -320,7 +320,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Replaced by Value(object) constructor", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Replaced by Value(object) constructor")</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
diff --git a/doc/en/GLib/ValueArray.xml b/doc/en/GLib/ValueArray.xml
index d9cfbe9c8..f9743c4fe 100644
--- a/doc/en/GLib/ValueArray.xml
+++ b/doc/en/GLib/ValueArray.xml
@@ -1,5 +1,5 @@
 <Type Name="ValueArray" FullName="GLib.ValueArray">
-  <TypeSignature Language="C#" Maintainer="auto" Value="public class ValueArray : GLib.IWrapper, System.Collections.ICollection, System.ICloneable, System.IDisposable" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public class ValueArray : GLib.IWrapper, ICloneable, IDisposable, System.Collections.ICollection" />
   <AssemblyInfo>
     <AssemblyName>glib-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>
@@ -29,7 +29,7 @@
   </Interfaces>
   <Attributes>
     <Attribute>
-      <AttributeName>System.Reflection.DefaultMember(MemberName="Item")</AttributeName>
+      <AttributeName>System.Reflection.DefaultMember("Item")</AttributeName>
     </Attribute>
   </Attributes>
   <Members>
@@ -229,7 +229,7 @@
       </Docs>
     </Member>
     <Member MemberName="Item">
-      <MemberSignature Language="C#" Value="public object Item[int index] { get; };" />
+      <MemberSignature Language="C#" Value="public object this[int index] { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
         <ReturnType>System.Object</ReturnType>