diff --git a/doc/ChangeLog b/doc/ChangeLog
index 487d42932..c2673d200 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,13 @@
+2003-02-17  Duncan Mak  <duncan@ximian.com>
+
+	* AtkSharp/*.xml:
+	* Gdk/*.xml:
+	* GdkSharp/*.xml:
+	* GladeSharp/*.xml:
+	* Gnome/*.xml:
+	* GnomeSharp/*.xml:
+	* Pango/*.xml: Some ref/out changes.
+
 2003-02-17  Duncan Mak  <duncan@ximian.com>
 
 	* makefile: Some makefile changes.
diff --git a/doc/en/AtkSharp/KeySnoopFuncNative.xml b/doc/en/AtkSharp/KeySnoopFuncNative.xml
index 6ba780292..db3dfc94b 100644
--- a/doc/en/AtkSharp/KeySnoopFuncNative.xml
+++ b/doc/en/AtkSharp/KeySnoopFuncNative.xml
@@ -1,5 +1,5 @@
 <Type Name="KeySnoopFuncNative" FullName="AtkSharp.KeySnoopFuncNative">
-  <TypeSignature Language="C#" Value="public sealed delegate int KeySnoopFuncNative (Atk.KeyEventStruct&amp; evnt, IntPtr func_data);" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public sealed delegate int KeySnoopFuncNative (ref Atk.KeyEventStruct evnt, IntPt func_data);" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>atk-sharp</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/doc/en/AtkSharp/KeySnoopFuncWrapper.xml b/doc/en/AtkSharp/KeySnoopFuncWrapper.xml
index a17c6a02e..188372b30 100644
--- a/doc/en/AtkSharp/KeySnoopFuncWrapper.xml
+++ b/doc/en/AtkSharp/KeySnoopFuncWrapper.xml
@@ -41,7 +41,7 @@
       </Docs>
     </Member>
     <Member MemberName="NativeCallback">
-      <MemberSignature Language="C#" Value="public int NativeCallback (Atk.KeyEventStruct&amp; evnt, IntPtr func_data);" />
+      <MemberSignature Language="C#" Value="public int NativeCallback (ref Atk.KeyEventStruct evnt, IntPt func_data);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Int32</ReturnType>
diff --git a/doc/en/AtkSharp/voidObjectPropertyValuesDelegate.xml b/doc/en/AtkSharp/voidObjectPropertyValuesDelegate.xml
index 58637a8a5..bcb607a50 100644
--- a/doc/en/AtkSharp/voidObjectPropertyValuesDelegate.xml
+++ b/doc/en/AtkSharp/voidObjectPropertyValuesDelegate.xml
@@ -1,5 +1,5 @@
 <Type Name="voidObjectPropertyValuesDelegate" FullName="AtkSharp.voidObjectPropertyValuesDelegate">
-  <TypeSignature Language="C#" Value="public sealed delegate void voidObjectPropertyValuesDelegate (IntPtr arg0, Atk.PropertyValues&amp; arg1, int key);" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public sealed delegate void voidObjectPropertyValuesDelegate (IntPtr arg0, ref Atk.PropertyValues arg1, in key);" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>atk-sharp</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/doc/en/Gdk/Color.xml b/doc/en/Gdk/Color.xml
index 1c5b52dfb..7d08d60a6 100644
--- a/doc/en/Gdk/Color.xml
+++ b/doc/en/Gdk/Color.xml
@@ -77,7 +77,7 @@
       </Docs>
     </Member>
     <Member MemberName="Parse">
-      <MemberSignature Language="C#" Value="public static int Parse (string spec, Gdk.Color&amp; color);" />
+      <MemberSignature Language="C#" Value="public static int Parse (string spec, ref Gdk.Color color);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Int32</ReturnType>
diff --git a/doc/en/Gdk/Drawable.xml b/doc/en/Gdk/Drawable.xml
index 1d2d146eb..1d555fe14 100644
--- a/doc/en/Gdk/Drawable.xml
+++ b/doc/en/Gdk/Drawable.xml
@@ -278,7 +278,7 @@
       </Docs>
     </Member>
     <Member MemberName="GetSize">
-      <MemberSignature Language="C#" Value="public void GetSize (ref int width, ref int height);" />
+      <MemberSignature Language="C#" Value="public void GetSize (out int width, out int height);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
@@ -289,8 +289,8 @@
       </Parameters>
       <Docs>
         <summary>To be added</summary>
-        <param name="width">To be added: an object of type 'int&amp;amp;'</param>
-        <param name="height">To be added: an object of type 'int&amp;amp;'</param>
+        <param name="width">To be added: an object of type 'int&amp;'</param>
+        <param name="height">To be added: an object of type 'int&amp;'</param>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Gdk/Window.xml b/doc/en/Gdk/Window.xml
index 76702fbce..518979020 100644
--- a/doc/en/Gdk/Window.xml
+++ b/doc/en/Gdk/Window.xml
@@ -507,7 +507,7 @@
       </Docs>
     </Member>
     <Member MemberName="GetPointer">
-      <MemberSignature Language="C#" Value="public Gdk.Window GetPointer (ref int x, ref int y, ref Gdk.ModifierType mask);" />
+      <MemberSignature Language="C#" Value="public Gdk.Window GetPointer (out int x, out int y, out Gdk.ModifierType mask);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>Gdk.Window</ReturnType>
@@ -519,8 +519,8 @@
       </Parameters>
       <Docs>
         <summary>To be added</summary>
-        <param name="x">To be added: an object of type 'int&amp;amp;'</param>
-        <param name="y">To be added: an object of type 'int&amp;amp;'</param>
+        <param name="x">To be added: an object of type 'int&amp;'</param>
+        <param name="y">To be added: an object of type 'int&amp;'</param>
         <param name="mask">To be added: an object of type 'Gdk.ModifierType&amp;'</param>
         <returns>To be added: an object of type 'Gdk.Window'</returns>
         <remarks>To be added</remarks>
diff --git a/doc/en/GdkSharp/SpanFuncNative.xml b/doc/en/GdkSharp/SpanFuncNative.xml
index a9d054000..4173ea745 100644
--- a/doc/en/GdkSharp/SpanFuncNative.xml
+++ b/doc/en/GdkSharp/SpanFuncNative.xml
@@ -1,5 +1,5 @@
 <Type Name="SpanFuncNative" FullName="GdkSharp.SpanFuncNative">
-  <TypeSignature Language="C#" Value="public sealed delegate void SpanFuncNative (Gdk.Span&amp; span, IntPtr data);" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public sealed delegate void SpanFuncNative (ref Gdk.Span span, IntPt data);" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gdk-sharp</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/doc/en/GdkSharp/SpanFuncWrapper.xml b/doc/en/GdkSharp/SpanFuncWrapper.xml
index 795d4ceca..9424ede43 100644
--- a/doc/en/GdkSharp/SpanFuncWrapper.xml
+++ b/doc/en/GdkSharp/SpanFuncWrapper.xml
@@ -41,7 +41,7 @@
       </Docs>
     </Member>
     <Member MemberName="NativeCallback">
-      <MemberSignature Language="C#" Value="public void NativeCallback (Gdk.Span&amp; span, IntPtr data);" />
+      <MemberSignature Language="C#" Value="public void NativeCallback (ref Gdk.Span span, IntPt data);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
diff --git a/doc/en/GladeSharp/BuildChildrenFuncNative.xml b/doc/en/GladeSharp/BuildChildrenFuncNative.xml
index d132e13af..acd99a464 100644
--- a/doc/en/GladeSharp/BuildChildrenFuncNative.xml
+++ b/doc/en/GladeSharp/BuildChildrenFuncNative.xml
@@ -1,5 +1,5 @@
 <Type Name="BuildChildrenFuncNative" FullName="GladeSharp.BuildChildrenFuncNative">
-  <TypeSignature Language="C#" Value="public sealed delegate void BuildChildrenFuncNative (IntPtr xml, IntPtr parent, Glade.WidgetInfo&amp; info);" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public sealed delegate void BuildChildrenFuncNative (IntPtr xml, IntPtr parent, ref Glade.WidgetInfo info);" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>glade-sharp</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/doc/en/GladeSharp/BuildChildrenFuncWrapper.xml b/doc/en/GladeSharp/BuildChildrenFuncWrapper.xml
index fcab3dab6..30bcb451f 100644
--- a/doc/en/GladeSharp/BuildChildrenFuncWrapper.xml
+++ b/doc/en/GladeSharp/BuildChildrenFuncWrapper.xml
@@ -41,7 +41,7 @@
       </Docs>
     </Member>
     <Member MemberName="NativeCallback">
-      <MemberSignature Language="C#" Value="public void NativeCallback (IntPtr xml, IntPtr parent, Glade.WidgetInfo&amp; info);" />
+      <MemberSignature Language="C#" Value="public void NativeCallback (IntPtr xml, IntPtr parent, ref Glade.WidgetInfo info);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
diff --git a/doc/en/GladeSharp/NewFuncNative.xml b/doc/en/GladeSharp/NewFuncNative.xml
index 05c9b8bb5..8e2437268 100644
--- a/doc/en/GladeSharp/NewFuncNative.xml
+++ b/doc/en/GladeSharp/NewFuncNative.xml
@@ -1,5 +1,5 @@
 <Type Name="NewFuncNative" FullName="GladeSharp.NewFuncNative">
-  <TypeSignature Language="C#" Value="public sealed delegate IntPtr NewFuncNative (IntPtr xml, uint widget_type, Glade.WidgetInfo&amp; info);" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public sealed delegate IntPtr NewFuncNative (IntPtr xml, uint widget_type, ref Glade.WidgetInfo info);" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>glade-sharp</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/doc/en/GladeSharp/NewFuncWrapper.xml b/doc/en/GladeSharp/NewFuncWrapper.xml
index 779805dc4..0f869413f 100644
--- a/doc/en/GladeSharp/NewFuncWrapper.xml
+++ b/doc/en/GladeSharp/NewFuncWrapper.xml
@@ -41,7 +41,7 @@
       </Docs>
     </Member>
     <Member MemberName="NativeCallback">
-      <MemberSignature Language="C#" Value="public IntPtr NativeCallback (IntPtr xml, uint widget_type, Glade.WidgetInfo&amp; info);" />
+      <MemberSignature Language="C#" Value="public IntPtr NativeCallback (IntPtr xml, uint widget_type, ref Glade.WidgetInfo info);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.IntPtr</ReturnType>
diff --git a/doc/en/Gnome/Canvas.xml b/doc/en/Gnome/Canvas.xml
index b6e73cf7c..d88f3f138 100644
--- a/doc/en/Gnome/Canvas.xml
+++ b/doc/en/Gnome/Canvas.xml
@@ -53,7 +53,7 @@
       </Docs>
     </Member>
     <Member MemberName="GetButtPoints">
-      <MemberSignature Language="C#" Value="public static void GetButtPoints (double x1, double y1, double x2, double y2, double width, int project, ref double bx1, ref double by1, ref double bx2, ref double by2);" />
+      <MemberSignature Language="C#" Value="public static void GetButtPoints (double x1, double y1, double x2, double y2, double width, int project, out double bx1, out double by1, out double bx2, out double by2);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
@@ -78,15 +78,15 @@
         <param name="y2">To be added: an object of type 'double'</param>
         <param name="width">To be added: an object of type 'double'</param>
         <param name="project">To be added: an object of type 'int'</param>
-        <param name="bx1">To be added: an object of type 'double&amp;amp;'</param>
-        <param name="by1">To be added: an object of type 'double&amp;amp;'</param>
-        <param name="bx2">To be added: an object of type 'double&amp;amp;'</param>
-        <param name="by2">To be added: an object of type 'double&amp;amp;'</param>
+        <param name="bx1">To be added: an object of type 'double&amp;'</param>
+        <param name="by1">To be added: an object of type 'double&amp;'</param>
+        <param name="bx2">To be added: an object of type 'double&amp;'</param>
+        <param name="by2">To be added: an object of type 'double&amp;'</param>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
     <Member MemberName="GetMiterPoints">
-      <MemberSignature Language="C#" Value="public static int GetMiterPoints (double x1, double y1, double x2, double y2, double x3, double y3, double width, ref double mx1, ref double my1, ref double mx2, ref double my2);" />
+      <MemberSignature Language="C#" Value="public static int GetMiterPoints (double x1, double y1, double x2, double y2, double x3, double y3, double width, out double mx1, out double my1, out double mx2, out double my2);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Int32</ReturnType>
@@ -113,10 +113,10 @@
         <param name="x3">To be added: an object of type 'double'</param>
         <param name="y3">To be added: an object of type 'double'</param>
         <param name="width">To be added: an object of type 'double'</param>
-        <param name="mx1">To be added: an object of type 'double&amp;amp;'</param>
-        <param name="my1">To be added: an object of type 'double&amp;amp;'</param>
-        <param name="mx2">To be added: an object of type 'double&amp;amp;'</param>
-        <param name="my2">To be added: an object of type 'double&amp;amp;'</param>
+        <param name="mx1">To be added: an object of type 'double&amp;'</param>
+        <param name="my1">To be added: an object of type 'double&amp;'</param>
+        <param name="mx2">To be added: an object of type 'double&amp;'</param>
+        <param name="my2">To be added: an object of type 'double&amp;'</param>
         <returns>To be added: an object of type 'int'</returns>
         <remarks>To be added</remarks>
       </Docs>
@@ -186,7 +186,7 @@
       </Docs>
     </Member>
     <Member MemberName="GetColor">
-      <MemberSignature Language="C#" Value="public int GetColor (string spec, ref Gdk.Color color);" />
+      <MemberSignature Language="C#" Value="public int GetColor (string spec, out Gdk.Color color);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Int32</ReturnType>
@@ -252,7 +252,7 @@
       </Docs>
     </Member>
     <Member MemberName="WorldToWindow">
-      <MemberSignature Language="C#" Value="public void WorldToWindow (double worldx, double worldy, double winx, ref double winy);" />
+      <MemberSignature Language="C#" Value="public void WorldToWindow (double worldx, double worldy, double winx, out double winy);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
@@ -268,7 +268,7 @@
         <param name="worldx">To be added: an object of type 'double'</param>
         <param name="worldy">To be added: an object of type 'double'</param>
         <param name="winx">To be added: an object of type 'double'</param>
-        <param name="winy">To be added: an object of type 'double&amp;amp;'</param>
+        <param name="winy">To be added: an object of type 'double&amp;'</param>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
@@ -328,7 +328,7 @@
       </Docs>
     </Member>
     <Member MemberName="GetScrollOffsets">
-      <MemberSignature Language="C#" Value="public void GetScrollOffsets (ref int cx, ref int cy);" />
+      <MemberSignature Language="C#" Value="public void GetScrollOffsets (out int cx, out int cy);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
@@ -339,8 +339,8 @@
       </Parameters>
       <Docs>
         <summary>To be added</summary>
-        <param name="cx">To be added: an object of type 'int&amp;amp;'</param>
-        <param name="cy">To be added: an object of type 'int&amp;amp;'</param>
+        <param name="cx">To be added: an object of type 'int&amp;'</param>
+        <param name="cy">To be added: an object of type 'int&amp;'</param>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
@@ -357,7 +357,7 @@
       </Docs>
     </Member>
     <Member MemberName="GetScrollRegion">
-      <MemberSignature Language="C#" Value="public void GetScrollRegion (ref double x1, ref double y1, ref double x2, ref double y2);" />
+      <MemberSignature Language="C#" Value="public void GetScrollRegion (out double x1, out double y1, out double x2, out double y2);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
@@ -370,15 +370,15 @@
       </Parameters>
       <Docs>
         <summary>To be added</summary>
-        <param name="x1">To be added: an object of type 'double&amp;amp;'</param>
-        <param name="y1">To be added: an object of type 'double&amp;amp;'</param>
-        <param name="x2">To be added: an object of type 'double&amp;amp;'</param>
-        <param name="y2">To be added: an object of type 'double&amp;amp;'</param>
+        <param name="x1">To be added: an object of type 'double&amp;'</param>
+        <param name="y1">To be added: an object of type 'double&amp;'</param>
+        <param name="x2">To be added: an object of type 'double&amp;'</param>
+        <param name="y2">To be added: an object of type 'double&amp;'</param>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
     <Member MemberName="W2cD">
-      <MemberSignature Language="C#" Value="public void W2cD (double wx, double wy, ref double cx, ref double cy);" />
+      <MemberSignature Language="C#" Value="public void W2cD (double wx, double wy, out double cx, out double cy);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
@@ -393,8 +393,8 @@
         <summary>To be added</summary>
         <param name="wx">To be added: an object of type 'double'</param>
         <param name="wy">To be added: an object of type 'double'</param>
-        <param name="cx">To be added: an object of type 'double&amp;amp;'</param>
-        <param name="cy">To be added: an object of type 'double&amp;amp;'</param>
+        <param name="cx">To be added: an object of type 'double&amp;'</param>
+        <param name="cy">To be added: an object of type 'double&amp;'</param>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
@@ -435,7 +435,7 @@
       </Docs>
     </Member>
     <Member MemberName="WindowToWorld">
-      <MemberSignature Language="C#" Value="public void WindowToWorld (double winx, double winy, ref double worldx, ref double worldy);" />
+      <MemberSignature Language="C#" Value="public void WindowToWorld (double winx, double winy, out double worldx, out double worldy);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
@@ -450,13 +450,13 @@
         <summary>To be added</summary>
         <param name="winx">To be added: an object of type 'double'</param>
         <param name="winy">To be added: an object of type 'double'</param>
-        <param name="worldx">To be added: an object of type 'double&amp;amp;'</param>
-        <param name="worldy">To be added: an object of type 'double&amp;amp;'</param>
+        <param name="worldx">To be added: an object of type 'double&amp;'</param>
+        <param name="worldy">To be added: an object of type 'double&amp;'</param>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
     <Member MemberName="W2c">
-      <MemberSignature Language="C#" Value="public void W2c (double wx, double wy, ref int cx, ref int cy);" />
+      <MemberSignature Language="C#" Value="public void W2c (double wx, double wy, out int cx, out int cy);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
@@ -471,8 +471,8 @@
         <summary>To be added</summary>
         <param name="wx">To be added: an object of type 'double'</param>
         <param name="wy">To be added: an object of type 'double'</param>
-        <param name="cx">To be added: an object of type 'int&amp;amp;'</param>
-        <param name="cy">To be added: an object of type 'int&amp;amp;'</param>
+        <param name="cx">To be added: an object of type 'int&amp;'</param>
+        <param name="cy">To be added: an object of type 'int&amp;'</param>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
@@ -510,7 +510,7 @@
       </Docs>
     </Member>
     <Member MemberName="C2w">
-      <MemberSignature Language="C#" Value="public void C2w (int cx, int cy, ref double wx, ref double wy);" />
+      <MemberSignature Language="C#" Value="public void C2w (int cx, int cy, out double wx, out double wy);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
@@ -525,8 +525,8 @@
         <summary>To be added</summary>
         <param name="cx">To be added: an object of type 'int'</param>
         <param name="cy">To be added: an object of type 'int'</param>
-        <param name="wx">To be added: an object of type 'double&amp;amp;'</param>
-        <param name="wy">To be added: an object of type 'double&amp;amp;'</param>
+        <param name="wx">To be added: an object of type 'double&amp;'</param>
+        <param name="wy">To be added: an object of type 'double&amp;'</param>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Gnome/CanvasItem.xml b/doc/en/Gnome/CanvasItem.xml
index b53a429a3..cb69e5a1f 100644
--- a/doc/en/Gnome/CanvasItem.xml
+++ b/doc/en/Gnome/CanvasItem.xml
@@ -218,7 +218,7 @@
       </Docs>
     </Member>
     <Member MemberName="GetBounds">
-      <MemberSignature Language="C#" Value="public void GetBounds (ref double x1, ref double y1, ref double x2, ref double y2);" />
+      <MemberSignature Language="C#" Value="public void GetBounds (out double x1, out double y1, out double x2, out double y2);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
@@ -231,10 +231,10 @@
       </Parameters>
       <Docs>
         <summary>To be added</summary>
-        <param name="x1">To be added: an object of type 'double&amp;amp;'</param>
-        <param name="y1">To be added: an object of type 'double&amp;amp;'</param>
-        <param name="x2">To be added: an object of type 'double&amp;amp;'</param>
-        <param name="y2">To be added: an object of type 'double&amp;amp;'</param>
+        <param name="x1">To be added: an object of type 'double&amp;'</param>
+        <param name="y1">To be added: an object of type 'double&amp;'</param>
+        <param name="x2">To be added: an object of type 'double&amp;'</param>
+        <param name="y2">To be added: an object of type 'double&amp;'</param>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Gnome/CanvasRichText.xml b/doc/en/Gnome/CanvasRichText.xml
index b7758eb55..aae6e5e47 100644
--- a/doc/en/Gnome/CanvasRichText.xml
+++ b/doc/en/Gnome/CanvasRichText.xml
@@ -36,7 +36,7 @@
       </Docs>
     </Member>
     <Member MemberName="GetIterAtLocation">
-      <MemberSignature Language="C#" Value="public void GetIterAtLocation (ref Gtk.TextIter iter, int x, int y);" />
+      <MemberSignature Language="C#" Value="public void GetIterAtLocation (out Gtk.TextIter iter, in x, in y);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
@@ -55,7 +55,7 @@
       </Docs>
     </Member>
     <Member MemberName="GetIterLocation">
-      <MemberSignature Language="C#" Value="public void GetIterLocation (Gtk.TextIter iter, ref Gdk.Rectangle location);" />
+      <MemberSignature Language="C#" Value="public void GetIterLocation (Gtk.TextIter iter, out Gdk.Rectangle location);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
diff --git a/doc/en/Gnome/Entry.xml b/doc/en/Gnome/Entry.xml
index d8e443c8f..ac60f82ec 100644
--- a/doc/en/Gnome/Entry.xml
+++ b/doc/en/Gnome/Entry.xml
@@ -112,7 +112,7 @@
       </Docs>
     </Member>
     <Member MemberName="GetSelectionBounds">
-      <MemberSignature Language="C#" Value="public virtual bool GetSelectionBounds (ref int start, ref int end);" />
+      <MemberSignature Language="C#" Value="public virtual bool GetSelectionBounds (out int start, out int end);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Boolean</ReturnType>
@@ -123,8 +123,8 @@
       </Parameters>
       <Docs>
         <summary>To be added</summary>
-        <param name="start">To be added: an object of type 'int&amp;amp;'</param>
-        <param name="end">To be added: an object of type 'int&amp;amp;'</param>
+        <param name="start">To be added: an object of type 'int&amp;'</param>
+        <param name="end">To be added: an object of type 'int&amp;'</param>
         <returns>To be added: an object of type 'bool'</returns>
         <remarks>To be added</remarks>
       </Docs>
@@ -142,7 +142,7 @@
       </Docs>
     </Member>
     <Member MemberName="InsertText">
-      <MemberSignature Language="C#" Value="public virtual void InsertText (string new_text, int new_text_length, int&amp;amp; position);" />
+      <MemberSignature Language="C#" Value="public virtual void InsertText (string new_text, int new_text_length, ref int position);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
@@ -156,7 +156,7 @@
         <summary>To be added</summary>
         <param name="new_text">To be added: an object of type 'string'</param>
         <param name="new_text_length">To be added: an object of type 'int'</param>
-        <param name="position">To be added: an object of type 'int&amp;amp;'</param>
+        <param name="position">To be added: an object of type 'int&amp;'</param>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Gnome/FileEntry.xml b/doc/en/Gnome/FileEntry.xml
index 2933ad8f3..945e53e99 100644
--- a/doc/en/Gnome/FileEntry.xml
+++ b/doc/en/Gnome/FileEntry.xml
@@ -112,7 +112,7 @@
       </Docs>
     </Member>
     <Member MemberName="GetSelectionBounds">
-      <MemberSignature Language="C#" Value="public virtual bool GetSelectionBounds (ref int start, ref int end);" />
+      <MemberSignature Language="C#" Value="public virtual bool GetSelectionBounds (out int start, out int end);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Boolean</ReturnType>
@@ -123,8 +123,8 @@
       </Parameters>
       <Docs>
         <summary>To be added</summary>
-        <param name="start">To be added: an object of type 'int&amp;amp;'</param>
-        <param name="end">To be added: an object of type 'int&amp;amp;'</param>
+        <param name="start">To be added: an object of type 'int&amp;'</param>
+        <param name="end">To be added: an object of type 'int&amp;'</param>
         <returns>To be added: an object of type 'bool'</returns>
         <remarks>To be added</remarks>
       </Docs>
@@ -142,7 +142,7 @@
       </Docs>
     </Member>
     <Member MemberName="InsertText">
-      <MemberSignature Language="C#" Value="public virtual void InsertText (string new_text, int new_text_length, int&amp;amp; position);" />
+      <MemberSignature Language="C#" Value="public virtual void InsertText (string new_text, int new_text_length, ref int position);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
@@ -156,7 +156,7 @@
         <summary>To be added</summary>
         <param name="new_text">To be added: an object of type 'string'</param>
         <param name="new_text_length">To be added: an object of type 'int'</param>
-        <param name="position">To be added: an object of type 'int&amp;amp;'</param>
+        <param name="position">To be added: an object of type 'int&amp;'</param>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/GnomeSharp/ModuleHookNative.xml b/doc/en/GnomeSharp/ModuleHookNative.xml
index b62eb6a8f..64aa8efee 100644
--- a/doc/en/GnomeSharp/ModuleHookNative.xml
+++ b/doc/en/GnomeSharp/ModuleHookNative.xml
@@ -1,5 +1,5 @@
 <Type Name="ModuleHookNative" FullName="GnomeSharp.ModuleHookNative">
-  <TypeSignature Language="C#" Value="public sealed delegate void ModuleHookNative (IntPtr program, Gnome.ModuleInfo&amp; mod_info);" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public sealed delegate void ModuleHookNative (IntPtr program, ref Gnome.ModuleInfo mod_info);" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/doc/en/GnomeSharp/ModuleHookWrapper.xml b/doc/en/GnomeSharp/ModuleHookWrapper.xml
index adec292e8..11d720e5e 100644
--- a/doc/en/GnomeSharp/ModuleHookWrapper.xml
+++ b/doc/en/GnomeSharp/ModuleHookWrapper.xml
@@ -41,7 +41,7 @@
       </Docs>
     </Member>
     <Member MemberName="NativeCallback">
-      <MemberSignature Language="C#" Value="public void NativeCallback (IntPtr program, Gnome.ModuleInfo&amp; mod_info);" />
+      <MemberSignature Language="C#" Value="public void NativeCallback (IntPtr program, ref Gnome.ModuleInfo mod_info);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
diff --git a/doc/en/GnomeSharp/ModuleInitHookNative.xml b/doc/en/GnomeSharp/ModuleInitHookNative.xml
index 55b43634d..ddecfa9b2 100644
--- a/doc/en/GnomeSharp/ModuleInitHookNative.xml
+++ b/doc/en/GnomeSharp/ModuleInitHookNative.xml
@@ -1,5 +1,5 @@
 <Type Name="ModuleInitHookNative" FullName="GnomeSharp.ModuleInitHookNative">
-  <TypeSignature Language="C#" Value="public sealed delegate void ModuleInitHookNative (Gnome.ModuleInfo&amp; mod_info);" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public sealed delegate void ModuleInitHookNative (ref Gnome.ModuleInfo mod_info);" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/doc/en/GnomeSharp/ModuleInitHookWrapper.xml b/doc/en/GnomeSharp/ModuleInitHookWrapper.xml
index 76d5721c2..a10954068 100644
--- a/doc/en/GnomeSharp/ModuleInitHookWrapper.xml
+++ b/doc/en/GnomeSharp/ModuleInitHookWrapper.xml
@@ -41,7 +41,7 @@
       </Docs>
     </Member>
     <Member MemberName="NativeCallback">
-      <MemberSignature Language="C#" Value="public void NativeCallback (Gnome.ModuleInfo&amp; mod_info);" />
+      <MemberSignature Language="C#" Value="public void NativeCallback (ref Gnome.ModuleInfo mod_info);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
diff --git a/doc/en/GnomeSharp/UISignalConnectFuncNative.xml b/doc/en/GnomeSharp/UISignalConnectFuncNative.xml
index ef93e0755..7365f7e3c 100644
--- a/doc/en/GnomeSharp/UISignalConnectFuncNative.xml
+++ b/doc/en/GnomeSharp/UISignalConnectFuncNative.xml
@@ -1,5 +1,5 @@
 <Type Name="UISignalConnectFuncNative" FullName="GnomeSharp.UISignalConnectFuncNative">
-  <TypeSignature Language="C#" Value="public sealed delegate void UISignalConnectFuncNative (Gnome.UIInfo&amp; uiinfo, string signal_name, Gnome.UIBuilderData&amp; uibdata);" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public sealed delegate void UISignalConnectFuncNative (ref Gnome.UIInfo uiinfo, strin signal_name, ref Gnome.UIBuilderData uibdata);" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/doc/en/GnomeSharp/UISignalConnectFuncWrapper.xml b/doc/en/GnomeSharp/UISignalConnectFuncWrapper.xml
index bafbd3b75..8e2dae964 100644
--- a/doc/en/GnomeSharp/UISignalConnectFuncWrapper.xml
+++ b/doc/en/GnomeSharp/UISignalConnectFuncWrapper.xml
@@ -41,7 +41,7 @@
       </Docs>
     </Member>
     <Member MemberName="NativeCallback">
-      <MemberSignature Language="C#" Value="public void NativeCallback (Gnome.UIInfo&amp; uiinfo, string signal_name, Gnome.UIBuilderData&amp; uibdata);" />
+      <MemberSignature Language="C#" Value="public void NativeCallback (ref Gnome.UIInfo uiinfo, strin signal_name, ref Gnome.UIBuilderData uibdata);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
diff --git a/doc/en/GnomeSharp/voidObjectCanvasBufDelegate.xml b/doc/en/GnomeSharp/voidObjectCanvasBufDelegate.xml
index 73376376b..bb80a6a48 100644
--- a/doc/en/GnomeSharp/voidObjectCanvasBufDelegate.xml
+++ b/doc/en/GnomeSharp/voidObjectCanvasBufDelegate.xml
@@ -1,5 +1,5 @@
 <Type Name="voidObjectCanvasBufDelegate" FullName="GnomeSharp.voidObjectCanvasBufDelegate">
-  <TypeSignature Language="C#" Value="public sealed delegate void voidObjectCanvasBufDelegate (IntPtr arg0, Gnome.CanvasBuf&amp; arg1, int key);" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public sealed delegate void voidObjectCanvasBufDelegate (IntPtr arg0, ref Gnome.CanvasBuf arg1, in key);" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/doc/en/GtkSharp/voidObjectAffineSVPintDelegate.xml b/doc/en/GtkSharp/voidObjectAffineSVPintDelegate.xml
index 2ffee54ed..46e3e2b0c 100644
--- a/doc/en/GtkSharp/voidObjectAffineSVPintDelegate.xml
+++ b/doc/en/GtkSharp/voidObjectAffineSVPintDelegate.xml
@@ -1,5 +1,5 @@
 <Type Name="voidObjectAffineSVPintDelegate" FullName="GtkSharp.voidObjectAffineSVPintDelegate">
-  <TypeSignature Language="C#" Value="public sealed delegate void voidObjectAffineSVPintDelegate (IntPtr arg0, IntPtr arg1, Art.SVP&amp; arg2, int arg3, int key);" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public sealed delegate void voidObjectAffineSVPintDelegate (IntPtr arg0, IntPtr arg1, ref Art.SVP arg2, in arg3, in key);" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gnome-sharp</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/doc/en/Pango/Layout.xml b/doc/en/Pango/Layout.xml
index 860516b40..7b310f4b4 100644
--- a/doc/en/Pango/Layout.xml
+++ b/doc/en/Pango/Layout.xml
@@ -149,7 +149,7 @@
       </Docs>
     </Member>
     <Member MemberName="GetSize">
-      <MemberSignature Language="C#" Value="public void GetSize (ref int width, ref int height);" />
+      <MemberSignature Language="C#" Value="public void GetSize (out int width, out int height);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
@@ -160,8 +160,8 @@
       </Parameters>
       <Docs>
         <summary>To be added</summary>
-        <param name="width">To be added: an object of type 'int&amp;amp;'</param>
-        <param name="height">To be added: an object of type 'int&amp;amp;'</param>
+        <param name="width">To be added: an object of type 'int&amp;'</param>
+        <param name="height">To be added: an object of type 'int&amp;'</param>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
@@ -259,7 +259,7 @@
       </Docs>
     </Member>
     <Member MemberName="GetPixelSize">
-      <MemberSignature Language="C#" Value="public void GetPixelSize (ref int width, ref int height);" />
+      <MemberSignature Language="C#" Value="public void GetPixelSize (out int width, out int height);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
@@ -270,8 +270,8 @@
       </Parameters>
       <Docs>
         <summary>To be added</summary>
-        <param name="width">To be added: an object of type 'int&amp;amp;'</param>
-        <param name="height">To be added: an object of type 'int&amp;amp;'</param>
+        <param name="width">To be added: an object of type 'int&amp;'</param>
+        <param name="height">To be added: an object of type 'int&amp;'</param>
         <remarks>To be added</remarks>
       </Docs>
     </Member>