diff --git a/doc/en/Pango/Alignment.xml b/doc/en/Pango/Alignment.xml
index 2010eae1f..da3e4ab23 100644
--- a/doc/en/Pango/Alignment.xml
+++ b/doc/en/Pango/Alignment.xml
@@ -24,7 +24,7 @@
   </Base>
   <Attributes>
     <Attribute>
-      <AttributeName>GLib.GType(WrapperType=typeof(Pango.AlignmentGType))</AttributeName>
+      <AttributeName>GLib.GType(typeof(Pango.AlignmentGType))</AttributeName>
     </Attribute>
   </Attributes>
   <Members>
diff --git a/doc/en/Pango/Analysis.xml b/doc/en/Pango/Analysis.xml
index 9b7a2ebe4..0d6ac86e4 100644
--- a/doc/en/Pango/Analysis.xml
+++ b/doc/en/Pango/Analysis.xml
@@ -59,7 +59,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Replaced by Language property", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Replaced by Language property")</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
@@ -78,7 +78,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Replaced by Font property", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Replaced by Font property")</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
@@ -110,7 +110,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Replaced by ShapeEngine property", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Replaced by ShapeEngine property")</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
@@ -128,7 +128,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Replaced by LangEngine property", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Replaced by LangEngine property")</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
diff --git a/doc/en/Pango/AttrBackground.xml b/doc/en/Pango/AttrBackground.xml
index 60786acff..4ab103e8d 100644
--- a/doc/en/Pango/AttrBackground.xml
+++ b/doc/en/Pango/AttrBackground.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>Pango.Attribute</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public AttrBackground (ushort red, ushort green, ushort blue);" />
diff --git a/doc/en/Pango/AttrFallback.xml b/doc/en/Pango/AttrFallback.xml
index a9e6ea7bb..9c3c350b1 100644
--- a/doc/en/Pango/AttrFallback.xml
+++ b/doc/en/Pango/AttrFallback.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>Pango.Attribute</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public AttrFallback (bool fallback);" />
diff --git a/doc/en/Pango/AttrFamily.xml b/doc/en/Pango/AttrFamily.xml
index f3e126ff9..e2308a308 100644
--- a/doc/en/Pango/AttrFamily.xml
+++ b/doc/en/Pango/AttrFamily.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>Pango.Attribute</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public AttrFamily (string family);" />
diff --git a/doc/en/Pango/AttrFilterFunc.xml b/doc/en/Pango/AttrFilterFunc.xml
index 9a64ad466..081199ca5 100644
--- a/doc/en/Pango/AttrFilterFunc.xml
+++ b/doc/en/Pango/AttrFilterFunc.xml
@@ -1,5 +1,5 @@
 <Type Name="AttrFilterFunc" FullName="Pango.AttrFilterFunc">
-  <TypeSignature Language="C#" Maintainer="auto" Value="public delegate bool AttrFilterFunc(Pango.Attribute attribute);" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public delegate bool AttrFilterFunc(Attribute attribute);" />
   <AssemblyInfo>
     <AssemblyName>pango-sharp</AssemblyName>
     <AssemblyPublicKey />
diff --git a/doc/en/Pango/AttrForeground.xml b/doc/en/Pango/AttrForeground.xml
index 7577ec42a..7ba30fe48 100644
--- a/doc/en/Pango/AttrForeground.xml
+++ b/doc/en/Pango/AttrForeground.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>Pango.Attribute</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public AttrForeground (ushort red, ushort green, ushort blue);" />
diff --git a/doc/en/Pango/AttrIterator.xml b/doc/en/Pango/AttrIterator.xml
index bacceabfb..e554c4569 100644
--- a/doc/en/Pango/AttrIterator.xml
+++ b/doc/en/Pango/AttrIterator.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>GLib.Opaque</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName="Destroy">
       <MemberSignature Language="C#" Value="public void Destroy ();" />
diff --git a/doc/en/Pango/AttrLetterSpacing.xml b/doc/en/Pango/AttrLetterSpacing.xml
index 49b5f713f..7f7608953 100644
--- a/doc/en/Pango/AttrLetterSpacing.xml
+++ b/doc/en/Pango/AttrLetterSpacing.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>Pango.Attribute</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public AttrLetterSpacing (int letter_spacing);" />
diff --git a/doc/en/Pango/AttrList.xml b/doc/en/Pango/AttrList.xml
index 3ffbb6049..957d95196 100644
--- a/doc/en/Pango/AttrList.xml
+++ b/doc/en/Pango/AttrList.xml
@@ -16,7 +16,8 @@
   <Base>
     <BaseTypeName>GLib.Opaque</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName="Copy">
       <MemberSignature Language="C#" Value="public Pango.AttrList Copy ();" />
@@ -44,10 +45,8 @@
         <summary>Insert the given attribute into the list.</summary>
         <param name="attr">a <see cref="T:Pango.Attribute" /></param>
         <remarks>It will replace any attributes of the same type on that segment and be merged with any adjoining attributes that are identical.  
-<block subset="none" type="note">
-            <para>This function is slower than <see cref="M:Pango.AttrList.Insert()" /> for creating a attribute list in order (potentially much slower for large lists). However, <see cref="M:Pango.AttrList.Insert()" /> is not suitable for continually changing a set of attributes since it never removes or combines existing attributes.
-  </para>
-          </block></remarks>
+<block subset="none" type="note"><para>This function is slower than <see cref="M:Pango.AttrList.Insert()" /> for creating a attribute list in order (potentially much slower for large lists). However, <see cref="M:Pango.AttrList.Insert()" /> is not suitable for continually changing a set of attributes since it never removes or combines existing attributes.
+  </para></block></remarks>
       </Docs>
     </Member>
     <Member MemberName="InsertBefore">
diff --git a/doc/en/Pango/AttrRise.xml b/doc/en/Pango/AttrRise.xml
index 0ed218fe1..4fb1ecf2e 100644
--- a/doc/en/Pango/AttrRise.xml
+++ b/doc/en/Pango/AttrRise.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>Pango.Attribute</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public AttrRise (int rise);" />
diff --git a/doc/en/Pango/AttrScale.xml b/doc/en/Pango/AttrScale.xml
index 53db7fc3b..cdbe7fcce 100644
--- a/doc/en/Pango/AttrScale.xml
+++ b/doc/en/Pango/AttrScale.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>Pango.Attribute</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public AttrScale (double scale);" />
diff --git a/doc/en/Pango/AttrStretch.xml b/doc/en/Pango/AttrStretch.xml
index e9760f9ba..f20adf4ee 100644
--- a/doc/en/Pango/AttrStretch.xml
+++ b/doc/en/Pango/AttrStretch.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>Pango.Attribute</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public AttrStretch (Pango.Stretch stretch);" />
diff --git a/doc/en/Pango/AttrStrikethrough.xml b/doc/en/Pango/AttrStrikethrough.xml
index 1bf4090f8..2d88830c0 100644
--- a/doc/en/Pango/AttrStrikethrough.xml
+++ b/doc/en/Pango/AttrStrikethrough.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>Pango.Attribute</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public AttrStrikethrough (bool strikethrough);" />
diff --git a/doc/en/Pango/AttrStrikethroughColor.xml b/doc/en/Pango/AttrStrikethroughColor.xml
index e0adfe51f..e8ffbde3a 100644
--- a/doc/en/Pango/AttrStrikethroughColor.xml
+++ b/doc/en/Pango/AttrStrikethroughColor.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>Pango.Attribute</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public AttrStrikethroughColor (ushort red, ushort green, ushort blue);" />
diff --git a/doc/en/Pango/AttrStyle.xml b/doc/en/Pango/AttrStyle.xml
index 5573809cf..056ff5398 100644
--- a/doc/en/Pango/AttrStyle.xml
+++ b/doc/en/Pango/AttrStyle.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>Pango.Attribute</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public AttrStyle (Pango.Style style);" />
diff --git a/doc/en/Pango/AttrType.xml b/doc/en/Pango/AttrType.xml
index 70f3dcc21..5a83e14c2 100644
--- a/doc/en/Pango/AttrType.xml
+++ b/doc/en/Pango/AttrType.xml
@@ -25,7 +25,7 @@
   </Base>
   <Attributes>
     <Attribute>
-      <AttributeName>GLib.GType(WrapperType=typeof(Pango.AttrTypeGType))</AttributeName>
+      <AttributeName>GLib.GType(typeof(Pango.AttrTypeGType))</AttributeName>
     </Attribute>
   </Attributes>
   <Members>
diff --git a/doc/en/Pango/AttrUnderline.xml b/doc/en/Pango/AttrUnderline.xml
index 78f377a9b..1630a1184 100644
--- a/doc/en/Pango/AttrUnderline.xml
+++ b/doc/en/Pango/AttrUnderline.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>Pango.Attribute</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public AttrUnderline (Pango.Underline underline);" />
diff --git a/doc/en/Pango/AttrUnderlineColor.xml b/doc/en/Pango/AttrUnderlineColor.xml
index dbb1e5a8a..3feba405e 100644
--- a/doc/en/Pango/AttrUnderlineColor.xml
+++ b/doc/en/Pango/AttrUnderlineColor.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>Pango.Attribute</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public AttrUnderlineColor (ushort red, ushort green, ushort blue);" />
diff --git a/doc/en/Pango/AttrVariant.xml b/doc/en/Pango/AttrVariant.xml
index 331c72b7f..503123fba 100644
--- a/doc/en/Pango/AttrVariant.xml
+++ b/doc/en/Pango/AttrVariant.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>Pango.Attribute</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public AttrVariant (Pango.Variant variant);" />
diff --git a/doc/en/Pango/AttrWeight.xml b/doc/en/Pango/AttrWeight.xml
index c78016375..b1e9c42ca 100644
--- a/doc/en/Pango/AttrWeight.xml
+++ b/doc/en/Pango/AttrWeight.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>Pango.Attribute</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public AttrWeight (Pango.Weight weight);" />
diff --git a/doc/en/Pango/Attribute.xml b/doc/en/Pango/Attribute.xml
index 020ed9b4b..e40e1937f 100644
--- a/doc/en/Pango/Attribute.xml
+++ b/doc/en/Pango/Attribute.xml
@@ -1,5 +1,5 @@
 <Type Name="Attribute" FullName="Pango.Attribute">
-  <TypeSignature Language="C#" Maintainer="auto" Value="public class Attribute : GLib.IWrapper, System.IDisposable" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public class Attribute : GLib.IWrapper, IDisposable" />
   <AssemblyInfo>
     <AssemblyName>pango-sharp</AssemblyName>
     <AssemblyPublicKey>
diff --git a/doc/en/Pango/Context.xml b/doc/en/Pango/Context.xml
index f0fe95043..b7ca651d3 100644
--- a/doc/en/Pango/Context.xml
+++ b/doc/en/Pango/Context.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>GLib.Object</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName="LoadFont">
       <MemberSignature Language="C#" Value="public Pango.Font LoadFont (Pango.FontDescription desc);" />
@@ -155,7 +156,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message=null, IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
diff --git a/doc/en/Pango/Coverage.xml b/doc/en/Pango/Coverage.xml
index e6072caf5..03f6e53f0 100644
--- a/doc/en/Pango/Coverage.xml
+++ b/doc/en/Pango/Coverage.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>GLib.Opaque</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName="Copy">
       <MemberSignature Language="C#" Value="public Pango.Coverage Copy ();" />
diff --git a/doc/en/Pango/CoverageLevel.xml b/doc/en/Pango/CoverageLevel.xml
index c2f627769..18a0eca05 100644
--- a/doc/en/Pango/CoverageLevel.xml
+++ b/doc/en/Pango/CoverageLevel.xml
@@ -16,7 +16,7 @@
   </Base>
   <Attributes>
     <Attribute>
-      <AttributeName>GLib.GType(WrapperType=typeof(Pango.CoverageLevelGType))</AttributeName>
+      <AttributeName>GLib.GType(typeof(Pango.CoverageLevelGType))</AttributeName>
     </Attribute>
   </Attributes>
   <Members>
diff --git a/doc/en/Pango/Direction.xml b/doc/en/Pango/Direction.xml
index 7ce5f24c1..0963a65bd 100644
--- a/doc/en/Pango/Direction.xml
+++ b/doc/en/Pango/Direction.xml
@@ -16,7 +16,7 @@
   </Base>
   <Attributes>
     <Attribute>
-      <AttributeName>GLib.GType(WrapperType=typeof(Pango.DirectionGType))</AttributeName>
+      <AttributeName>GLib.GType(typeof(Pango.DirectionGType))</AttributeName>
     </Attribute>
   </Attributes>
   <Members>
diff --git a/doc/en/Pango/EllipsizeMode.xml b/doc/en/Pango/EllipsizeMode.xml
index 4219d4ea4..a332c2831 100644
--- a/doc/en/Pango/EllipsizeMode.xml
+++ b/doc/en/Pango/EllipsizeMode.xml
@@ -16,7 +16,7 @@
   </Base>
   <Attributes>
     <Attribute>
-      <AttributeName>GLib.GType(WrapperType=typeof(Pango.EllipsizeModeGType))</AttributeName>
+      <AttributeName>GLib.GType(typeof(Pango.EllipsizeModeGType))</AttributeName>
     </Attribute>
   </Attributes>
   <Members>
diff --git a/doc/en/Pango/Font.xml b/doc/en/Pango/Font.xml
index 195a2badf..997df2a17 100644
--- a/doc/en/Pango/Font.xml
+++ b/doc/en/Pango/Font.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>GLib.Object</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName="GetMetrics">
       <MemberSignature Language="C#" Value="public Pango.FontMetrics GetMetrics (Pango.Language language);" />
@@ -140,7 +141,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message=null, IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
diff --git a/doc/en/Pango/FontDescription.xml b/doc/en/Pango/FontDescription.xml
index d6b34d342..7ace167f7 100644
--- a/doc/en/Pango/FontDescription.xml
+++ b/doc/en/Pango/FontDescription.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>GLib.Opaque</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName="FromString">
       <MemberSignature Language="C#" Value="public static Pango.FontDescription FromString (string str);" />
@@ -30,17 +31,7 @@
         <param name="str">The string representation of the font description.</param>
         <returns>The object of type <see cref="T:Pango.FontDescription" /> created.</returns>
         <remarks>The form of the string representation is "[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]", where:
-<list type="bullet">
-            <item>
-              <term>FAMILY-LIST is a comma separated list of families optionally terminated by a comma.</term>
-            </item>
-            <item>
-              <term>STYLE-OPTIONS is a whitespace separated list of words where each WORD describes one of style, variant, weight, or stretch.</term>
-            </item>
-            <item>
-              <term>SIZE is a decimal number (size in points)</term>
-            </item>
-          </list><para>
+<list type="bullet"><item><term>FAMILY-LIST is a comma separated list of families optionally terminated by a comma.</term></item><item><term>STYLE-OPTIONS is a whitespace separated list of words where each WORD describes one of style, variant, weight, or stretch.</term></item><item><term>SIZE is a decimal number (size in points)</term></item></list><para>
 Any one of the options may be absent. If FAMILY-LIST is absent, then the family_name field of the resulting font description will be initialized to NULL. If STYLE-OPTIONS is missing, then all style options will be set to the default values. If SIZE is missing, the size in the resulting font description will be set to 0.
 </para></remarks>
       </Docs>
diff --git a/doc/en/Pango/FontFace.xml b/doc/en/Pango/FontFace.xml
index a1a5a1b8b..bafac2ded 100644
--- a/doc/en/Pango/FontFace.xml
+++ b/doc/en/Pango/FontFace.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>GLib.Object</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName="Describe">
       <MemberSignature Language="C#" Value="public Pango.FontDescription Describe ();" />
@@ -83,7 +84,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message=null, IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
diff --git a/doc/en/Pango/FontFamily.xml b/doc/en/Pango/FontFamily.xml
index b4218b3bd..213ce1a4a 100644
--- a/doc/en/Pango/FontFamily.xml
+++ b/doc/en/Pango/FontFamily.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>GLib.Object</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public FontFamily (IntPtr raw);" />
@@ -70,7 +71,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message=null, IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
diff --git a/doc/en/Pango/FontMap.xml b/doc/en/Pango/FontMap.xml
index 1b0b5f921..54d4bab63 100644
--- a/doc/en/Pango/FontMap.xml
+++ b/doc/en/Pango/FontMap.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>GLib.Object</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName="LoadFont">
       <MemberSignature Language="C#" Value="public Pango.Font LoadFont (Pango.Context context, Pango.FontDescription desc);" />
@@ -96,7 +97,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message=null, IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
diff --git a/doc/en/Pango/FontMask.xml b/doc/en/Pango/FontMask.xml
index be24cf041..4a86a7770 100644
--- a/doc/en/Pango/FontMask.xml
+++ b/doc/en/Pango/FontMask.xml
@@ -16,7 +16,7 @@
   </Base>
   <Attributes>
     <Attribute>
-      <AttributeName>GLib.GType(WrapperType=typeof(Pango.FontMaskGType))</AttributeName>
+      <AttributeName>GLib.GType(typeof(Pango.FontMaskGType))</AttributeName>
     </Attribute>
     <Attribute>
       <AttributeName>System.Flags</AttributeName>
diff --git a/doc/en/Pango/Fontset.xml b/doc/en/Pango/Fontset.xml
index e561cfe92..b2cc0af78 100644
--- a/doc/en/Pango/Fontset.xml
+++ b/doc/en/Pango/Fontset.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>GLib.Object</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName="GetFont">
       <MemberSignature Language="C#" Value="public Pango.Font GetFont (uint wc);" />
@@ -86,7 +87,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message=null, IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
diff --git a/doc/en/Pango/FontsetForeachFunc.xml b/doc/en/Pango/FontsetForeachFunc.xml
index d6418cfd2..e51c84f74 100644
--- a/doc/en/Pango/FontsetForeachFunc.xml
+++ b/doc/en/Pango/FontsetForeachFunc.xml
@@ -1,5 +1,5 @@
 <Type Name="FontsetForeachFunc" FullName="Pango.FontsetForeachFunc">
-  <TypeSignature Language="C#" Maintainer="auto" Value="public delegate bool FontsetForeachFunc(Pango.Fontset fontset, Pango.Font font);" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public delegate bool FontsetForeachFunc(Fontset fontset, Font font);" />
   <AssemblyInfo>
     <AssemblyName>pango-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/Pango/Global.xml b/doc/en/Pango/Global.xml
index ac00a1d3d..e752dc797 100644
--- a/doc/en/Pango/Global.xml
+++ b/doc/en/Pango/Global.xml
@@ -361,7 +361,7 @@ If no delimiters are found, both <paramref name="paragraph_delimiter_index" /> a
         <since version="Gtk# 2.4" />
       </Docs>
     </Member>
-  <Member MemberName="IsZeroWidth">
+    <Member MemberName="IsZeroWidth">
       <MemberSignature Language="C#" Value="public static bool IsZeroWidth (char ch);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
@@ -377,5 +377,7 @@ If no delimiters are found, both <paramref name="paragraph_delimiter_index" /> a
           <see langword="true" /> if <paramref name="ch" /> is zero width.</returns>
         <remarks>Zero width characters are not normally rendered on-screen.</remarks>
         <since version="Gtk# 2.10" />
-      </Docs></Member></Members>
+      </Docs>
+    </Member>
+  </Members>
 </Type>
diff --git a/doc/en/Pango/GlyphItem.xml b/doc/en/Pango/GlyphItem.xml
index b919dd95c..3ec59bfe5 100644
--- a/doc/en/Pango/GlyphItem.xml
+++ b/doc/en/Pango/GlyphItem.xml
@@ -91,7 +91,7 @@ This function is similar in function to <see cref="M:Pango.Item.Split()" /> (and
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Replaced by Glyphs property", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Replaced by Glyphs property")</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
@@ -120,7 +120,7 @@ This function is similar in function to <see cref="M:Pango.Item.Split()" /> (and
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Replaced by Item property", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Replaced by Item property")</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
diff --git a/doc/en/Pango/GlyphString.xml b/doc/en/Pango/GlyphString.xml
index 67e019f1d..41626d9bf 100644
--- a/doc/en/Pango/GlyphString.xml
+++ b/doc/en/Pango/GlyphString.xml
@@ -21,7 +21,7 @@
       <MemberType>Field</MemberType>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Pango.GlyphString is a reference type now, use null", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Pango.GlyphString is a reference type now, use null")</AttributeName>
         </Attribute>
       </Attributes>
       <ReturnValue>
diff --git a/doc/en/Pango/Item.xml b/doc/en/Pango/Item.xml
index 99c94693b..07b5db504 100644
--- a/doc/en/Pango/Item.xml
+++ b/doc/en/Pango/Item.xml
@@ -29,7 +29,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Pango.Item is a reference type now, use null", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Pango.Item is a reference type now, use null")</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
diff --git a/doc/en/Pango/Language.xml b/doc/en/Pango/Language.xml
index 04fa619db..8c839c545 100644
--- a/doc/en/Pango/Language.xml
+++ b/doc/en/Pango/Language.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>GLib.Opaque</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName="FromString">
       <MemberSignature Language="C#" Value="public static Pango.Language FromString (string language);" />
diff --git a/doc/en/Pango/Layout.xml b/doc/en/Pango/Layout.xml
index 31a1219a2..bbb22589c 100644
--- a/doc/en/Pango/Layout.xml
+++ b/doc/en/Pango/Layout.xml
@@ -66,7 +66,8 @@ class LayoutSample : DrawingArea
   <Base>
     <BaseTypeName>GLib.Object</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName="MoveCursorVisually">
       <MemberSignature Language="C#" Value="public void MoveCursorVisually (bool strong, int old_index, int old_trailing, int direction, out int new_index, out int new_trailing);" />
@@ -324,7 +325,7 @@ The X coordinate of the resulting <see cref="T:Pango.Rectangle" /> represents th
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message=null, IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
@@ -633,7 +634,7 @@ The X coordinate of the resulting <see cref="T:Pango.Rectangle" /> represents th
         <since version="Gtk# 2.6" />
       </Docs>
     </Member>
-  <Member MemberName="IndexToLineX">
+    <Member MemberName="IndexToLineX">
       <MemberSignature Language="C#" Value="public void IndexToLineX (int index_, bool trailing, out int line, out int x_pos);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
@@ -653,5 +654,7 @@ The X coordinate of the resulting <see cref="T:Pango.Rectangle" /> represents th
         <summary>Converts from a byte index to a line and X position.</summary>
         <remarks>The <paramref name="x_pos" /> is measured from the left edge of the line.</remarks>
         <since version="Gtk# 2.10" />
-      </Docs></Member></Members>
+      </Docs>
+    </Member>
+  </Members>
 </Type>
diff --git a/doc/en/Pango/LayoutIter.xml b/doc/en/Pango/LayoutIter.xml
index 3b0f1f2a7..64f381a8d 100644
--- a/doc/en/Pango/LayoutIter.xml
+++ b/doc/en/Pango/LayoutIter.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>GLib.Opaque</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName="GetClusterExtents">
       <MemberSignature Language="C#" Value="public void GetClusterExtents (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect);" />
diff --git a/doc/en/Pango/LayoutRun.xml b/doc/en/Pango/LayoutRun.xml
index 95927d2ab..33b44c160 100644
--- a/doc/en/Pango/LayoutRun.xml
+++ b/doc/en/Pango/LayoutRun.xml
@@ -69,7 +69,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Replaced by Glyphs property", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Replaced by Glyphs property")</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
@@ -98,7 +98,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Replaced by Item property", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Replaced by Item property")</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
diff --git a/doc/en/Pango/Matrix.xml b/doc/en/Pango/Matrix.xml
index d254de90e..737f4bd76 100644
--- a/doc/en/Pango/Matrix.xml
+++ b/doc/en/Pango/Matrix.xml
@@ -258,7 +258,7 @@
         <remarks>This operator is primarily for internal use.</remarks>
       </Docs>
     </Member>
-  <Member MemberName="FontScaleFactor">
+    <Member MemberName="FontScaleFactor">
       <MemberSignature Language="C#" Value="public double FontScaleFactor { get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
@@ -269,5 +269,7 @@
         <value>a floating point value where 1.0 indicates no scaling.</value>
         <remarks />
         <since version="Gtk# 2.10" />
-      </Docs></Member></Members>
+      </Docs>
+    </Member>
+  </Members>
 </Type>
diff --git a/doc/en/Pango/RenderPart.xml b/doc/en/Pango/RenderPart.xml
index 8819fbdfd..2aa9f2fdc 100644
--- a/doc/en/Pango/RenderPart.xml
+++ b/doc/en/Pango/RenderPart.xml
@@ -16,7 +16,7 @@
   </Base>
   <Attributes>
     <Attribute>
-      <AttributeName>GLib.GType(WrapperType=typeof(Pango.RenderPartGType))</AttributeName>
+      <AttributeName>GLib.GType(typeof(Pango.RenderPartGType))</AttributeName>
     </Attribute>
   </Attributes>
   <Members>
diff --git a/doc/en/Pango/Renderer.xml b/doc/en/Pango/Renderer.xml
index bd12c3045..bb0e56348 100644
--- a/doc/en/Pango/Renderer.xml
+++ b/doc/en/Pango/Renderer.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>GLib.Object</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName="DrawLayout">
       <MemberSignature Language="C#" Value="public void DrawLayout (Pango.Layout layout, int x, int y);" />
@@ -253,7 +254,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message=null, IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete</AttributeName>
         </Attribute>
       </Attributes>
     </Member>
diff --git a/doc/en/Pango/Scale.xml b/doc/en/Pango/Scale.xml
index 097b1b147..2fbcfb537 100644
--- a/doc/en/Pango/Scale.xml
+++ b/doc/en/Pango/Scale.xml
@@ -147,7 +147,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Replaced by XXSmall", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Replaced by XXSmall")</AttributeName>
         </Attribute>
       </Attributes>
       <MemberValue>0.5787037037037</MemberValue>
@@ -165,7 +165,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Replaced by XSmall", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Replaced by XSmall")</AttributeName>
         </Attribute>
       </Attributes>
       <MemberValue>0.6444444444444</MemberValue>
@@ -183,7 +183,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Replaced by XLarge", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Replaced by XLarge")</AttributeName>
         </Attribute>
       </Attributes>
       <MemberValue>1.4399999999999</MemberValue>
@@ -201,7 +201,7 @@
       </Docs>
       <Attributes>
         <Attribute>
-          <AttributeName>System.Obsolete(Message="Replaced by XXLarge", IsError=False)</AttributeName>
+          <AttributeName>System.Obsolete("Replaced by XXLarge")</AttributeName>
         </Attribute>
       </Attributes>
       <MemberValue>1.728</MemberValue>
diff --git a/doc/en/Pango/Script.xml b/doc/en/Pango/Script.xml
index 3ee52b72b..6a8466063 100644
--- a/doc/en/Pango/Script.xml
+++ b/doc/en/Pango/Script.xml
@@ -16,7 +16,7 @@
   </Base>
   <Attributes>
     <Attribute>
-      <AttributeName>GLib.GType(WrapperType=typeof(Pango.ScriptGType))</AttributeName>
+      <AttributeName>GLib.GType(typeof(Pango.ScriptGType))</AttributeName>
     </Attribute>
   </Attributes>
   <Members>
diff --git a/doc/en/Pango/ScriptIter.xml b/doc/en/Pango/ScriptIter.xml
index 6bf715118..0a890d813 100644
--- a/doc/en/Pango/ScriptIter.xml
+++ b/doc/en/Pango/ScriptIter.xml
@@ -15,7 +15,8 @@
   <Base>
     <BaseTypeName>GLib.Opaque</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName="Free">
       <MemberSignature Language="C#" Value="public void Free ();" />
diff --git a/doc/en/Pango/Stretch.xml b/doc/en/Pango/Stretch.xml
index 7cc11ab8b..54b980450 100644
--- a/doc/en/Pango/Stretch.xml
+++ b/doc/en/Pango/Stretch.xml
@@ -19,7 +19,7 @@
   </Base>
   <Attributes>
     <Attribute>
-      <AttributeName>GLib.GType(WrapperType=typeof(Pango.StretchGType))</AttributeName>
+      <AttributeName>GLib.GType(typeof(Pango.StretchGType))</AttributeName>
     </Attribute>
   </Attributes>
   <Members>
diff --git a/doc/en/Pango/Style.xml b/doc/en/Pango/Style.xml
index 8983b7ed8..552d4c0e1 100644
--- a/doc/en/Pango/Style.xml
+++ b/doc/en/Pango/Style.xml
@@ -19,7 +19,7 @@
   </Base>
   <Attributes>
     <Attribute>
-      <AttributeName>GLib.GType(WrapperType=typeof(Pango.StyleGType))</AttributeName>
+      <AttributeName>GLib.GType(typeof(Pango.StyleGType))</AttributeName>
     </Attribute>
   </Attributes>
   <Members>
diff --git a/doc/en/Pango/TabAlign.xml b/doc/en/Pango/TabAlign.xml
index b558bf480..f4314c4c4 100644
--- a/doc/en/Pango/TabAlign.xml
+++ b/doc/en/Pango/TabAlign.xml
@@ -24,7 +24,7 @@
   </Base>
   <Attributes>
     <Attribute>
-      <AttributeName>GLib.GType(WrapperType=typeof(Pango.TabAlignGType))</AttributeName>
+      <AttributeName>GLib.GType(typeof(Pango.TabAlignGType))</AttributeName>
     </Attribute>
   </Attributes>
   <Members>
diff --git a/doc/en/Pango/TabArray.xml b/doc/en/Pango/TabArray.xml
index 3ed32852a..f3668c99b 100644
--- a/doc/en/Pango/TabArray.xml
+++ b/doc/en/Pango/TabArray.xml
@@ -14,7 +14,8 @@
   <Base>
     <BaseTypeName>GLib.Opaque</BaseTypeName>
   </Base>
-  <Interfaces></Interfaces>
+  <Interfaces>
+  </Interfaces>
   <Members>
     <Member MemberName="Copy">
       <MemberSignature Language="C#" Value="public Pango.TabArray Copy ();" />
diff --git a/doc/en/Pango/Underline.xml b/doc/en/Pango/Underline.xml
index a34b336e3..4bf8bb579 100644
--- a/doc/en/Pango/Underline.xml
+++ b/doc/en/Pango/Underline.xml
@@ -19,7 +19,7 @@
   </Base>
   <Attributes>
     <Attribute>
-      <AttributeName>GLib.GType(WrapperType=typeof(Pango.UnderlineGType))</AttributeName>
+      <AttributeName>GLib.GType(typeof(Pango.UnderlineGType))</AttributeName>
     </Attribute>
   </Attributes>
   <Members>
diff --git a/doc/en/Pango/Variant.xml b/doc/en/Pango/Variant.xml
index 7b4a5cbc6..af7027d7e 100644
--- a/doc/en/Pango/Variant.xml
+++ b/doc/en/Pango/Variant.xml
@@ -16,7 +16,7 @@
   </Base>
   <Attributes>
     <Attribute>
-      <AttributeName>GLib.GType(WrapperType=typeof(Pango.VariantGType))</AttributeName>
+      <AttributeName>GLib.GType(typeof(Pango.VariantGType))</AttributeName>
     </Attribute>
   </Attributes>
   <Members>
diff --git a/doc/en/Pango/Weight.xml b/doc/en/Pango/Weight.xml
index fd65aa7cc..438089544 100644
--- a/doc/en/Pango/Weight.xml
+++ b/doc/en/Pango/Weight.xml
@@ -21,7 +21,7 @@
   </Base>
   <Attributes>
     <Attribute>
-      <AttributeName>GLib.GType(WrapperType=typeof(Pango.WeightGType))</AttributeName>
+      <AttributeName>GLib.GType(typeof(Pango.WeightGType))</AttributeName>
     </Attribute>
   </Attributes>
   <Members>
diff --git a/doc/en/Pango/WrapMode.xml b/doc/en/Pango/WrapMode.xml
index 463f9973b..e574484a4 100644
--- a/doc/en/Pango/WrapMode.xml
+++ b/doc/en/Pango/WrapMode.xml
@@ -19,7 +19,7 @@
   </Base>
   <Attributes>
     <Attribute>
-      <AttributeName>GLib.GType(WrapperType=typeof(Pango.WrapModeGType))</AttributeName>
+      <AttributeName>GLib.GType(typeof(Pango.WrapModeGType))</AttributeName>
     </Attribute>
   </Attributes>
   <Members>