diff --git a/reference/cairo/cairopssurface/leveltostring.xml b/reference/cairo/cairopssurface/leveltostring.xml
index 9b2a101cf2..1ac0361ca6 100644
--- a/reference/cairo/cairopssurface/leveltostring.xml
+++ b/reference/cairo/cairopssurface/leveltostring.xml
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>CairoPsSurface::levelToString</methodname>
-   <methodparam><type>string</type><parameter>level</parameter></methodparam>
+   <methodparam><type>int</type><parameter>level</parameter></methodparam>
   </methodsynopsis>
   <para>
    The method description goes here.
diff --git a/reference/cairo/functions/cairo-font-options-set-antialias.xml b/reference/cairo/functions/cairo-font-options-set-antialias.xml
index e2629797e3..5f1aba3d4b 100644
--- a/reference/cairo/functions/cairo-font-options-set-antialias.xml
+++ b/reference/cairo/functions/cairo-font-options-set-antialias.xml
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>void</type><methodname>cairo_font_options_set_antialias</methodname>
    <methodparam><type>CairoFontOptions</type><parameter>options</parameter></methodparam>
-   <methodparam><type>string</type><parameter>antialias</parameter></methodparam>
+   <methodparam><type>int</type><parameter>antialias</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-font-options-set-hint-metrics.xml b/reference/cairo/functions/cairo-font-options-set-hint-metrics.xml
index bad435d36d..4b1c46713e 100644
--- a/reference/cairo/functions/cairo-font-options-set-hint-metrics.xml
+++ b/reference/cairo/functions/cairo-font-options-set-hint-metrics.xml
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>void</type><methodname>cairo_font_options_set_hint_metrics</methodname>
    <methodparam><type>CairoFontOptions</type><parameter>options</parameter></methodparam>
-   <methodparam><type>string</type><parameter>hint_metrics</parameter></methodparam>
+   <methodparam><type>int</type><parameter>hint_metrics</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-font-options-set-hint-style.xml b/reference/cairo/functions/cairo-font-options-set-hint-style.xml
index 38908af014..49589cdfb6 100644
--- a/reference/cairo/functions/cairo-font-options-set-hint-style.xml
+++ b/reference/cairo/functions/cairo-font-options-set-hint-style.xml
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>void</type><methodname>cairo_font_options_set_hint_style</methodname>
    <methodparam><type>CairoFontOptions</type><parameter>options</parameter></methodparam>
-   <methodparam><type>string</type><parameter>hint_style</parameter></methodparam>
+   <methodparam><type>int</type><parameter>hint_style</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-font-options-set-subpixel-order.xml b/reference/cairo/functions/cairo-font-options-set-subpixel-order.xml
index e6fd99faae..47829b48e7 100644
--- a/reference/cairo/functions/cairo-font-options-set-subpixel-order.xml
+++ b/reference/cairo/functions/cairo-font-options-set-subpixel-order.xml
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>void</type><methodname>cairo_font_options_set_subpixel_order</methodname>
    <methodparam><type>CairoFontOptions</type><parameter>options</parameter></methodparam>
-   <methodparam><type>string</type><parameter>subpixel_order</parameter></methodparam>
+   <methodparam><type>int</type><parameter>subpixel_order</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-matrix-rotate.xml b/reference/cairo/functions/cairo-matrix-rotate.xml
index 5da57f356b..bc001547d2 100644
--- a/reference/cairo/functions/cairo-matrix-rotate.xml
+++ b/reference/cairo/functions/cairo-matrix-rotate.xml
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>void</type><methodname>cairo_matrix_rotate</methodname>
    <methodparam><type>CairoMatrix</type><parameter>matrix</parameter></methodparam>
-   <methodparam><type>string</type><parameter>radians</parameter></methodparam>
+   <methodparam><type>float</type><parameter>radians</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-matrix-transform-distance.xml b/reference/cairo/functions/cairo-matrix-transform-distance.xml
index 0a1a95ab4e..4eed9f3b99 100644
--- a/reference/cairo/functions/cairo-matrix-transform-distance.xml
+++ b/reference/cairo/functions/cairo-matrix-transform-distance.xml
@@ -12,8 +12,8 @@
   <methodsynopsis>
    <type>array</type><methodname>cairo_matrix_transform_distance</methodname>
    <methodparam><type>CairoMatrix</type><parameter>matrix</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dx</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dy</parameter></methodparam>
+   <methodparam><type>float</type><parameter>dx</parameter></methodparam>
+   <methodparam><type>float</type><parameter>dy</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-matrix-transform-point.xml b/reference/cairo/functions/cairo-matrix-transform-point.xml
index d57504e378..8cc6d8ed58 100644
--- a/reference/cairo/functions/cairo-matrix-transform-point.xml
+++ b/reference/cairo/functions/cairo-matrix-transform-point.xml
@@ -12,8 +12,8 @@
   <methodsynopsis>
    <type>array</type><methodname>cairo_matrix_transform_point</methodname>
    <methodparam><type>CairoMatrix</type><parameter>matrix</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dx</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dy</parameter></methodparam>
+   <methodparam><type>float</type><parameter>dx</parameter></methodparam>
+   <methodparam><type>float</type><parameter>dy</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-matrix-translate.xml b/reference/cairo/functions/cairo-matrix-translate.xml
index 55304af074..e3977bdee7 100644
--- a/reference/cairo/functions/cairo-matrix-translate.xml
+++ b/reference/cairo/functions/cairo-matrix-translate.xml
@@ -12,8 +12,8 @@
   <methodsynopsis>
    <type>void</type><methodname>cairo_matrix_translate</methodname>
    <methodparam><type>CairoMatrix</type><parameter>matrix</parameter></methodparam>
-   <methodparam><type>string</type><parameter>tx</parameter></methodparam>
-   <methodparam><type>string</type><parameter>ty</parameter></methodparam>
+   <methodparam><type>float</type><parameter>tx</parameter></methodparam>
+   <methodparam><type>float</type><parameter>ty</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-pattern-add-color-stop-rgb.xml b/reference/cairo/functions/cairo-pattern-add-color-stop-rgb.xml
index 92423c1463..c04f0e7da3 100644
--- a/reference/cairo/functions/cairo-pattern-add-color-stop-rgb.xml
+++ b/reference/cairo/functions/cairo-pattern-add-color-stop-rgb.xml
@@ -12,10 +12,10 @@
   <methodsynopsis>
    <type>void</type><methodname>cairo_pattern_add_color_stop_rgb</methodname>
    <methodparam><type>CairoGradientPattern</type><parameter>pattern</parameter></methodparam>
-   <methodparam><type>string</type><parameter>offset</parameter></methodparam>
-   <methodparam><type>string</type><parameter>red</parameter></methodparam>
-   <methodparam><type>string</type><parameter>green</parameter></methodparam>
-   <methodparam><type>string</type><parameter>blue</parameter></methodparam>
+   <methodparam><type>float</type><parameter>offset</parameter></methodparam>
+   <methodparam><type>float</type><parameter>red</parameter></methodparam>
+   <methodparam><type>float</type><parameter>green</parameter></methodparam>
+   <methodparam><type>float</type><parameter>blue</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-pattern-add-color-stop-rgba.xml b/reference/cairo/functions/cairo-pattern-add-color-stop-rgba.xml
index ddb70a22cd..5fa07e47e3 100644
--- a/reference/cairo/functions/cairo-pattern-add-color-stop-rgba.xml
+++ b/reference/cairo/functions/cairo-pattern-add-color-stop-rgba.xml
@@ -12,11 +12,11 @@
   <methodsynopsis>
    <type>void</type><methodname>cairo_pattern_add_color_stop_rgba</methodname>
    <methodparam><type>CairoGradientPattern</type><parameter>pattern</parameter></methodparam>
-   <methodparam><type>string</type><parameter>offset</parameter></methodparam>
-   <methodparam><type>string</type><parameter>red</parameter></methodparam>
-   <methodparam><type>string</type><parameter>green</parameter></methodparam>
-   <methodparam><type>string</type><parameter>blue</parameter></methodparam>
-   <methodparam><type>string</type><parameter>alpha</parameter></methodparam>
+   <methodparam><type>float</type><parameter>offset</parameter></methodparam>
+   <methodparam><type>float</type><parameter>red</parameter></methodparam>
+   <methodparam><type>float</type><parameter>green</parameter></methodparam>
+   <methodparam><type>float</type><parameter>blue</parameter></methodparam>
+   <methodparam><type>float</type><parameter>alpha</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-pattern-get-color-stop-rgba.xml b/reference/cairo/functions/cairo-pattern-get-color-stop-rgba.xml
index 337a9786c0..bf52c94fa5 100644
--- a/reference/cairo/functions/cairo-pattern-get-color-stop-rgba.xml
+++ b/reference/cairo/functions/cairo-pattern-get-color-stop-rgba.xml
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>array</type><methodname>cairo_pattern_get_color_stop_rgba</methodname>
    <methodparam><type>CairoGradientPattern</type><parameter>pattern</parameter></methodparam>
-   <methodparam><type>string</type><parameter>index</parameter></methodparam>
+   <methodparam><type>int</type><parameter>index</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-pattern-set-filter.xml b/reference/cairo/functions/cairo-pattern-set-filter.xml
index b8519a2012..7c02f4227b 100644
--- a/reference/cairo/functions/cairo-pattern-set-filter.xml
+++ b/reference/cairo/functions/cairo-pattern-set-filter.xml
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>void</type><methodname>cairo_pattern_set_filter</methodname>
    <methodparam><type>CairoSurfacePattern</type><parameter>pattern</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>filter</parameter></methodparam>
+   <methodparam><type>int</type><parameter>filter</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-pattern-set-matrix.xml b/reference/cairo/functions/cairo-pattern-set-matrix.xml
index bdae91e107..9920a337be 100644
--- a/reference/cairo/functions/cairo-pattern-set-matrix.xml
+++ b/reference/cairo/functions/cairo-pattern-set-matrix.xml
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>void</type><methodname>cairo_pattern_set_matrix</methodname>
    <methodparam><type>CairoPattern</type><parameter>pattern</parameter></methodparam>
-   <methodparam choice="opt"><type>CairoMatrix</type><parameter>matrix</parameter></methodparam>
+   <methodparam><type>CairoMatrix</type><parameter>matrix</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-pdf-surface-set-size.xml b/reference/cairo/functions/cairo-pdf-surface-set-size.xml
index 2ccebc5d79..3bfa752c77 100644
--- a/reference/cairo/functions/cairo-pdf-surface-set-size.xml
+++ b/reference/cairo/functions/cairo-pdf-surface-set-size.xml
@@ -12,8 +12,8 @@
   <methodsynopsis>
    <type>void</type><methodname>cairo_pdf_surface_set_size</methodname>
    <methodparam><type>CairoPdfSurface</type><parameter>surface</parameter></methodparam>
-   <methodparam><type>string</type><parameter>width</parameter></methodparam>
-   <methodparam><type>string</type><parameter>height</parameter></methodparam>
+   <methodparam><type>float</type><parameter>width</parameter></methodparam>
+   <methodparam><type>float</type><parameter>height</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-ps-level-to-string.xml b/reference/cairo/functions/cairo-ps-level-to-string.xml
index ab6ba9d588..aebc5f5295 100644
--- a/reference/cairo/functions/cairo-ps-level-to-string.xml
+++ b/reference/cairo/functions/cairo-ps-level-to-string.xml
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>string</type><methodname>cairo_ps_level_to_string</methodname>
-   <methodparam><type>string</type><parameter>level</parameter></methodparam>
+   <methodparam><type>int</type><parameter>level</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-ps-surface-restrict-to-level.xml b/reference/cairo/functions/cairo-ps-surface-restrict-to-level.xml
index 002bcc42a1..beae391374 100644
--- a/reference/cairo/functions/cairo-ps-surface-restrict-to-level.xml
+++ b/reference/cairo/functions/cairo-ps-surface-restrict-to-level.xml
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>void</type><methodname>cairo_ps_surface_restrict_to_level</methodname>
    <methodparam><type>CairoPsSurface</type><parameter>surface</parameter></methodparam>
-   <methodparam><type>string</type><parameter>level</parameter></methodparam>
+   <methodparam><type>int</type><parameter>level</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-ps-surface-set-eps.xml b/reference/cairo/functions/cairo-ps-surface-set-eps.xml
index 51278ea18e..80105aeb72 100644
--- a/reference/cairo/functions/cairo-ps-surface-set-eps.xml
+++ b/reference/cairo/functions/cairo-ps-surface-set-eps.xml
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>void</type><methodname>cairo_ps_surface_set_eps</methodname>
    <methodparam><type>CairoPsSurface</type><parameter>surface</parameter></methodparam>
-   <methodparam><type>string</type><parameter>level</parameter></methodparam>
+   <methodparam><type>bool</type><parameter>level</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-ps-surface-set-size.xml b/reference/cairo/functions/cairo-ps-surface-set-size.xml
index 5ceedad68f..6b0339f113 100644
--- a/reference/cairo/functions/cairo-ps-surface-set-size.xml
+++ b/reference/cairo/functions/cairo-ps-surface-set-size.xml
@@ -12,8 +12,8 @@
   <methodsynopsis>
    <type>void</type><methodname>cairo_ps_surface_set_size</methodname>
    <methodparam><type>CairoPsSurface</type><parameter>surface</parameter></methodparam>
-   <methodparam><type>string</type><parameter>width</parameter></methodparam>
-   <methodparam><type>string</type><parameter>height</parameter></methodparam>
+   <methodparam><type>float</type><parameter>width</parameter></methodparam>
+   <methodparam><type>float</type><parameter>height</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-scaled-font-glyph-extents.xml b/reference/cairo/functions/cairo-scaled-font-glyph-extents.xml
index ddf4dcd51f..eb4235b703 100644
--- a/reference/cairo/functions/cairo-scaled-font-glyph-extents.xml
+++ b/reference/cairo/functions/cairo-scaled-font-glyph-extents.xml
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>array</type><methodname>cairo_scaled_font_glyph_extents</methodname>
    <methodparam><type>CairoScaledFont</type><parameter>scaledfont</parameter></methodparam>
-   <methodparam><type>string</type><parameter>glyphs</parameter></methodparam>
+   <methodparam><type>array</type><parameter>glyphs</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-surface-create-similar.xml b/reference/cairo/functions/cairo-surface-create-similar.xml
index c6d0ee6db3..be6b54bbee 100644
--- a/reference/cairo/functions/cairo-surface-create-similar.xml
+++ b/reference/cairo/functions/cairo-surface-create-similar.xml
@@ -12,9 +12,9 @@
   <methodsynopsis>
    <type>CairoSurface</type><methodname>cairo_surface_create_similar</methodname>
    <methodparam><type>CairoSurface</type><parameter>surface</parameter></methodparam>
-   <methodparam><type>string</type><parameter>content</parameter></methodparam>
-   <methodparam><type>string</type><parameter>width</parameter></methodparam>
-   <methodparam><type>string</type><parameter>height</parameter></methodparam>
+   <methodparam><type>int</type><parameter>content</parameter></methodparam>
+   <methodparam><type>float</type><parameter>width</parameter></methodparam>
+   <methodparam><type>float</type><parameter>height</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-surface-mark-dirty-rectangle.xml b/reference/cairo/functions/cairo-surface-mark-dirty-rectangle.xml
index 7eef8c3924..5f51106ae2 100644
--- a/reference/cairo/functions/cairo-surface-mark-dirty-rectangle.xml
+++ b/reference/cairo/functions/cairo-surface-mark-dirty-rectangle.xml
@@ -12,10 +12,10 @@
   <methodsynopsis>
    <type>void</type><methodname>cairo_surface_mark_dirty_rectangle</methodname>
    <methodparam><type>CairoSurface</type><parameter>surface</parameter></methodparam>
-   <methodparam><type>string</type><parameter>x</parameter></methodparam>
-   <methodparam><type>string</type><parameter>y</parameter></methodparam>
-   <methodparam><type>string</type><parameter>width</parameter></methodparam>
-   <methodparam><type>string</type><parameter>height</parameter></methodparam>
+   <methodparam><type>float</type><parameter>x</parameter></methodparam>
+   <methodparam><type>float</type><parameter>y</parameter></methodparam>
+   <methodparam><type>float</type><parameter>width</parameter></methodparam>
+   <methodparam><type>float</type><parameter>height</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-surface-set-device-offset.xml b/reference/cairo/functions/cairo-surface-set-device-offset.xml
index 6f36770657..772bdb9362 100644
--- a/reference/cairo/functions/cairo-surface-set-device-offset.xml
+++ b/reference/cairo/functions/cairo-surface-set-device-offset.xml
@@ -12,8 +12,8 @@
   <methodsynopsis>
    <type>void</type><methodname>cairo_surface_set_device_offset</methodname>
    <methodparam><type>CairoSurface</type><parameter>surface</parameter></methodparam>
-   <methodparam><type>string</type><parameter>x</parameter></methodparam>
-   <methodparam><type>string</type><parameter>y</parameter></methodparam>
+   <methodparam><type>float</type><parameter>x</parameter></methodparam>
+   <methodparam><type>float</type><parameter>y</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-surface-set-fallback-resolution.xml b/reference/cairo/functions/cairo-surface-set-fallback-resolution.xml
index ef437d9c70..227ba21e22 100644
--- a/reference/cairo/functions/cairo-surface-set-fallback-resolution.xml
+++ b/reference/cairo/functions/cairo-surface-set-fallback-resolution.xml
@@ -12,8 +12,8 @@
   <methodsynopsis>
    <type>void</type><methodname>cairo_surface_set_fallback_resolution</methodname>
    <methodparam><type>CairoSurface</type><parameter>surface</parameter></methodparam>
-   <methodparam><type>string</type><parameter>x</parameter></methodparam>
-   <methodparam><type>string</type><parameter>y</parameter></methodparam>
+   <methodparam><type>float</type><parameter>x</parameter></methodparam>
+   <methodparam><type>float</type><parameter>y</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
diff --git a/reference/cairo/functions/cairo-surface-write-to-png.xml b/reference/cairo/functions/cairo-surface-write-to-png.xml
index 8123075e47..58965ed999 100644
--- a/reference/cairo/functions/cairo-surface-write-to-png.xml
+++ b/reference/cairo/functions/cairo-surface-write-to-png.xml
@@ -12,8 +12,7 @@
   <methodsynopsis>
    <type>void</type><methodname>cairo_surface_write_to_png</methodname>
    <methodparam><type>CairoSurface</type><parameter>surface</parameter></methodparam>
-   <methodparam><type>string</type><parameter>x</parameter></methodparam>
-   <methodparam><type>string</type><parameter>y</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>stream</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.
@@ -36,15 +35,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       Description...
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
+     <term><parameter>stream</parameter></term>
      <listitem>
       <para>
        Description...
diff --git a/reference/cairo/functions/cairo-svg-surface-restrict-to-version.xml b/reference/cairo/functions/cairo-svg-surface-restrict-to-version.xml
index 55db241a3c..74c4f8f31e 100644
--- a/reference/cairo/functions/cairo-svg-surface-restrict-to-version.xml
+++ b/reference/cairo/functions/cairo-svg-surface-restrict-to-version.xml
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>void</type><methodname>cairo_svg_surface_restrict_to_version</methodname>
    <methodparam><type>CairoSvgSurface</type><parameter>surface</parameter></methodparam>
-   <methodparam><type>string</type><parameter>version</parameter></methodparam>
+   <methodparam><type>int</type><parameter>version</parameter></methodparam>
   </methodsynopsis>
   <para>
    The function description goes here.