diff --git a/doc/public/tmpl/cairo-font.sgml b/doc/public/tmpl/cairo-font.sgml
index 097b04760..add99ec4d 100644
--- a/doc/public/tmpl/cairo-font.sgml
+++ b/doc/public/tmpl/cairo-font.sgml
@@ -49,28 +49,6 @@ Base class for fonts
 @Returns: 
 
 
-<!-- ##### FUNCTION cairo_font_face_get_user_data ##### -->
-<para>
-
-</para>
-
-@font_face: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_font_face_set_user_data ##### -->
-<para>
-
-</para>
-
-@font_face: 
-@key: 
-@user_data: 
-@destroy: 
-@Returns: 
-
-
 <!-- ##### ENUM cairo_font_type_t ##### -->
 <para>
 
@@ -90,3 +68,34 @@ Base class for fonts
 @Returns: 
 
 
+<!-- ##### FUNCTION cairo_font_face_get_reference_count ##### -->
+<para>
+
+</para>
+
+@font_face: 
+@Returns: 
+
+
+<!-- ##### FUNCTION cairo_font_face_set_user_data ##### -->
+<para>
+
+</para>
+
+@font_face: 
+@key: 
+@user_data: 
+@destroy: 
+@Returns: 
+
+
+<!-- ##### FUNCTION cairo_font_face_get_user_data ##### -->
+<para>
+
+</para>
+
+@font_face: 
+@key: 
+@Returns: 
+
+
diff --git a/doc/public/tmpl/cairo-pattern.sgml b/doc/public/tmpl/cairo-pattern.sgml
index 56b5a9d08..8925b111a 100644
--- a/doc/public/tmpl/cairo-pattern.sgml
+++ b/doc/public/tmpl/cairo-pattern.sgml
@@ -182,14 +182,6 @@ Gradients and filtered sources
 @Returns: 
 
 
-<!-- ##### FUNCTION cairo_pattern_destroy ##### -->
-<para>
-
-</para>
-
-@pattern: 
-
-
 <!-- ##### FUNCTION cairo_pattern_reference ##### -->
 <para>
 
@@ -199,6 +191,14 @@ Gradients and filtered sources
 @Returns: 
 
 
+<!-- ##### FUNCTION cairo_pattern_destroy ##### -->
+<para>
+
+</para>
+
+@pattern: 
+
+
 <!-- ##### FUNCTION cairo_pattern_status ##### -->
 <para>
 
@@ -303,3 +303,34 @@ Gradients and filtered sources
 @Returns: 
 
 
+<!-- ##### FUNCTION cairo_pattern_get_reference_count ##### -->
+<para>
+
+</para>
+
+@pattern: 
+@Returns: 
+
+
+<!-- ##### FUNCTION cairo_pattern_set_user_data ##### -->
+<para>
+
+</para>
+
+@pattern: 
+@key: 
+@user_data: 
+@destroy: 
+@Returns: 
+
+
+<!-- ##### FUNCTION cairo_pattern_get_user_data ##### -->
+<para>
+
+</para>
+
+@pattern: 
+@key: 
+@Returns: 
+
+
diff --git a/doc/public/tmpl/cairo-scaled-font.sgml b/doc/public/tmpl/cairo-scaled-font.sgml
index 3e1ce481c..4175d1984 100644
--- a/doc/public/tmpl/cairo-scaled-font.sgml
+++ b/doc/public/tmpl/cairo-scaled-font.sgml
@@ -159,3 +159,34 @@ Caching metrics for a particular font size
 @Returns: 
 
 
+<!-- ##### FUNCTION cairo_scaled_font_get_reference_count ##### -->
+<para>
+
+</para>
+
+@scaled_font: 
+@Returns: 
+
+
+<!-- ##### FUNCTION cairo_scaled_font_set_user_data ##### -->
+<para>
+
+</para>
+
+@scaled_font: 
+@key: 
+@user_data: 
+@destroy: 
+@Returns: 
+
+
+<!-- ##### FUNCTION cairo_scaled_font_get_user_data ##### -->
+<para>
+
+</para>
+
+@scaled_font: 
+@key: 
+@Returns: 
+
+
diff --git a/doc/public/tmpl/cairo-surface.sgml b/doc/public/tmpl/cairo-surface.sgml
index 2f7d49ecb..15929f396 100644
--- a/doc/public/tmpl/cairo-surface.sgml
+++ b/doc/public/tmpl/cairo-surface.sgml
@@ -44,6 +44,15 @@ Base class for surfaces
 @Returns: 
 
 
+<!-- ##### FUNCTION cairo_surface_reference ##### -->
+<para>
+
+</para>
+
+@surface: 
+@Returns: 
+
+
 <!-- ##### FUNCTION cairo_surface_destroy ##### -->
 <para>
 
@@ -52,6 +61,15 @@ Base class for surfaces
 @surface: 
 
 
+<!-- ##### FUNCTION cairo_surface_status ##### -->
+<para>
+
+</para>
+
+@surface: 
+@Returns: 
+
+
 <!-- ##### FUNCTION cairo_surface_finish ##### -->
 <para>
 
@@ -86,28 +104,6 @@ Base class for surfaces
 @Returns: 
 
 
-<!-- ##### FUNCTION cairo_surface_set_user_data ##### -->
-<para>
-
-</para>
-
-@surface: 
-@key: 
-@user_data: 
-@destroy: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_surface_get_user_data ##### -->
-<para>
-
-</para>
-
-@surface: 
-@key: 
-@Returns: 
-
-
 <!-- ##### FUNCTION cairo_surface_mark_dirty ##### -->
 <para>
 
@@ -128,15 +124,6 @@ Base class for surfaces
 @height: 
 
 
-<!-- ##### FUNCTION cairo_surface_reference ##### -->
-<para>
-
-</para>
-
-@surface: 
-@Returns: 
-
-
 <!-- ##### FUNCTION cairo_surface_set_device_offset ##### -->
 <para>
 
@@ -167,15 +154,6 @@ Base class for surfaces
 @y_pixels_per_inch: 
 
 
-<!-- ##### FUNCTION cairo_surface_status ##### -->
-<para>
-
-</para>
-
-@surface: 
-@Returns: 
-
-
 <!-- ##### ENUM cairo_surface_type_t ##### -->
 <para>
 
@@ -192,7 +170,6 @@ Base class for surfaces
 @CAIRO_SURFACE_TYPE_BEOS: 
 @CAIRO_SURFACE_TYPE_DIRECTFB: 
 @CAIRO_SURFACE_TYPE_SVG: 
-@CAIRO_SURFACE_TYPE_NQUARTZ: 
 @CAIRO_SURFACE_TYPE_OS2: 
 
 <!-- ##### FUNCTION cairo_surface_get_type ##### -->
@@ -204,3 +181,34 @@ Base class for surfaces
 @Returns: 
 
 
+<!-- ##### FUNCTION cairo_surface_get_reference_count ##### -->
+<para>
+
+</para>
+
+@surface: 
+@Returns: 
+
+
+<!-- ##### FUNCTION cairo_surface_set_user_data ##### -->
+<para>
+
+</para>
+
+@surface: 
+@key: 
+@user_data: 
+@destroy: 
+@Returns: 
+
+
+<!-- ##### FUNCTION cairo_surface_get_user_data ##### -->
+<para>
+
+</para>
+
+@surface: 
+@key: 
+@Returns: 
+
+
diff --git a/doc/public/tmpl/cairo-text.sgml b/doc/public/tmpl/cairo-text.sgml
index 87f626c0e..00366f26b 100644
--- a/doc/public/tmpl/cairo-text.sgml
+++ b/doc/public/tmpl/cairo-text.sgml
@@ -98,6 +98,42 @@ Rendering text and sets of glyphs
 @options: 
 
 
+<!-- ##### FUNCTION cairo_set_font_face ##### -->
+<para>
+
+</para>
+
+@cr: 
+@font_face: 
+
+
+<!-- ##### FUNCTION cairo_get_font_face ##### -->
+<para>
+
+</para>
+
+@cr: 
+@Returns: 
+
+
+<!-- ##### FUNCTION cairo_set_scaled_font ##### -->
+<para>
+
+</para>
+
+@cr: 
+@scaled_font: 
+
+
+<!-- ##### FUNCTION cairo_get_scaled_font ##### -->
+<para>
+
+</para>
+
+@cr: 
+@Returns: 
+
+
 <!-- ##### FUNCTION cairo_show_text ##### -->
 <para>
 
@@ -117,15 +153,6 @@ Rendering text and sets of glyphs
 @num_glyphs: 
 
 
-<!-- ##### FUNCTION cairo_get_font_face ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
 <!-- ##### FUNCTION cairo_font_extents ##### -->
 <para>
 
@@ -135,24 +162,6 @@ Rendering text and sets of glyphs
 @extents: 
 
 
-<!-- ##### FUNCTION cairo_set_font_face ##### -->
-<para>
-
-</para>
-
-@cr: 
-@font_face: 
-
-
-<!-- ##### FUNCTION cairo_set_scaled_font ##### -->
-<para>
-
-</para>
-
-@cr: 
-@scaled_font: 
-
-
 <!-- ##### FUNCTION cairo_text_extents ##### -->
 <para>
 
diff --git a/doc/public/tmpl/cairo.sgml b/doc/public/tmpl/cairo.sgml
index 4b9dc0e7a..2f5c637c0 100644
--- a/doc/public/tmpl/cairo.sgml
+++ b/doc/public/tmpl/cairo.sgml
@@ -481,6 +481,15 @@ The cairo drawing context
 @rectangle_list: 
 
 
+<!-- ##### FUNCTION cairo_copy_clip_rectangle_list ##### -->
+<para>
+
+</para>
+
+@cr: 
+@Returns: 
+
+
 <!-- ##### FUNCTION cairo_fill ##### -->
 <para>
 
@@ -612,3 +621,34 @@ The cairo drawing context
 @cr: 
 
 
+<!-- ##### FUNCTION cairo_get_reference_count ##### -->
+<para>
+
+</para>
+
+@cr: 
+@Returns: 
+
+
+<!-- ##### FUNCTION cairo_set_user_data ##### -->
+<para>
+
+</para>
+
+@cr: 
+@key: 
+@user_data: 
+@destroy: 
+@Returns: 
+
+
+<!-- ##### FUNCTION cairo_get_user_data ##### -->
+<para>
+
+</para>
+
+@cr: 
+@key: 
+@Returns: 
+
+