Re-synch with latest from gtk-doc CVS tree.

Add --only-section-tmpl option so that changes to inline documentation does not lead to churn in the .sgml template files.
Commit new templates now that gtk-doc has ripped all the inline portions out.
New template files added for new sections.
Update to match current API.
Make parameter names match those in the .c file and its documentation.

22 files changed, 177 insertions, 1922 deletions

diff --git a/ChangeLog b/ChangeLog
index 3e6e5811b..2be500b67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2005-05-24  Carl Worth  <cworth@cworth.org>
+
+	* gtk-doc.make: Re-synch with latest from gtk-doc CVS tree.
+
+	* doc/public/Makefile.am (MKTMPL_OPTIONS): Add --only-section-tmpl
+	option so that changes to inline documentation does not lead to
+	churn in the .sgml template files.
+
+	* doc/public/tmpl/cairo-font.sgml:
+	* doc/public/tmpl/cairo-ft.sgml:
+	* doc/public/tmpl/cairo-glitz.sgml:
+	* doc/public/tmpl/cairo-matrix.sgml:
+	* doc/public/tmpl/cairo-pattern.sgml:
+	* doc/public/tmpl/cairo-pdf.sgml:
+	* doc/public/tmpl/cairo-png.sgml:
+	* doc/public/tmpl/cairo-ps.sgml:
+	* doc/public/tmpl/cairo-quartz.sgml:
+	* doc/public/tmpl/cairo-surface.sgml:
+	* doc/public/tmpl/cairo-xcb.sgml:
+	* doc/public/tmpl/cairo-xlib.sgml:
+	* doc/public/tmpl/cairo.sgml: Commit new templates now that
+	gtk-doc has ripped all the inline portions out.
+
+	* doc/public/tmpl/cairo-win32.sgml:
+	* doc/public/tmpl/cairo-xcb-xrender.sgml:
+	* doc/public/tmpl/cairo-xlib-xrender.sgml: New template files
+	added for new sections.
+
+	* doc/public/cairo-sections.txt: Update to match current API.
+
+	* src/cairo-xcb.h: Make parameter names match those in the .c file
+	and its documentation.
+
 2005-05-22  Carl Worth  <cworth@cworth.org>
 
 	* src/cairo.c (cairo_create): Protect less-than and greater-than
diff --git a/doc/public/.cvsignore b/doc/public/.cvsignore
index 35479d5e3..ff4418d10 100644
--- a/doc/public/.cvsignore
+++ b/doc/public/.cvsignore
@@ -3,6 +3,7 @@ Makefile
 Makefile.in
 cairo-decl-list.txt
 cairo-decl.txt
+cairo-docs.sgml
 cairo-undocumented.txt
 cairo-unused.txt
 cairo.hierarchy
@@ -13,3 +14,5 @@ cairo.signals
 html
 xml
 
+
+
diff --git a/doc/public/Makefile.am b/doc/public/Makefile.am
index f058d36aa..9d89a38d9 100644
--- a/doc/public/Makefile.am
+++ b/doc/public/Makefile.am
@@ -38,6 +38,9 @@ GTKDOC_LIBS =
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS=--sgml-mode --output-format=xml
 
+# Extra options to supply to gtkdoc-mktmpl
+MKTMPL_OPTIONS=--only-section-tmpl
+
 # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
 content_files =					\
 	language-bindings.xml
diff --git a/doc/public/cairo-sections.txt b/doc/public/cairo-sections.txt
index b462436b8..5f626aa49 100644
--- a/doc/public/cairo-sections.txt
+++ b/doc/public/cairo-sections.txt
@@ -1,7 +1,6 @@
 <SECTION>
 <FILE>cairo-atsui</FILE>
 <TITLE>ATSUI Fonts</TITLE>
-cairo_atsui_font_create
 </SECTION>
 
 <SECTION>
@@ -23,7 +22,8 @@ cairo_glitz_surface_create
 <FILE>cairo-pdf</FILE>
 <TITLE>PDF Backend</TITLE>
 cairo_pdf_surface_create
-cairo_pdf_surface_create_for_callback
+cairo_pdf_surface_create_for_stream
+cairo_pdf_surface_set_dpi
 </SECTION>
 
 <SECTION>
@@ -39,6 +39,8 @@ cairo_surface_write_to_png_stream
 <FILE>cairo-ps</FILE>
 <TITLE>PS Backend</TITLE>
 cairo_ps_surface_create
+cairo_ps_surface_create_for_stream
+cairo_ps_surface_set_dpi
 </SECTION>
 
 <SECTION>
@@ -61,30 +63,38 @@ cairo_win32_scaled_font_get_metrics_factor
 <FILE>cairo-xcb</FILE>
 <TITLE>XCB Backend</TITLE>
 cairo_xcb_surface_create
+cairo_xcb_surface_create_for_bitmap
+cairo_xcb_surface_set_size
+</SECTION>
+
+<SECTION>
+<FILE>cairo-xcb-xrender</FILE>
+<TITLE>XCB Backend</TITLE>
+cairo_xcb_surface_create_with_xrender_format
 </SECTION>
 
 <SECTION>
 <FILE>cairo-xlib</FILE>
 <TITLE>XLib Backend</TITLE>
 cairo_xlib_surface_create
-cairo_xlib_surface_create_with_visual
+cairo_xlib_surface_create_for_bitmap
 cairo_xlib_surface_set_size
 </SECTION>
 
 <SECTION>
+<FILE>cairo-xlib-xrender</FILE>
+<TITLE>XLib/Xrender Backend</TITLE>
+cairo_xlib_surface_create_with_xrender_format
+</SECTION>
+
+<SECTION>
 <FILE>cairo-surface</FILE>
 <TITLE>cairo_surface_t</TITLE>
 cairo_surface_t
-cairo_surface_create_for_image
 cairo_surface_create_similar
 cairo_surface_reference
 cairo_surface_destroy
 cairo_surface_finish
-cairo_surface_set_repeat
-cairo_surface_set_matrix
-cairo_surface_get_matrix
-cairo_surface_set_filter
-cairo_surface_get_filter
 cairo_surface_set_user_data
 cairo_surface_get_user_data
 cairo_surface_set_device_offset
@@ -108,8 +118,6 @@ cairo_pattern_set_extend
 cairo_pattern_get_extend
 cairo_pattern_set_filter
 cairo_pattern_get_filter
-<SUBSECTION Private>
-cairo_pattern_add_color_stop
 </SECTION>
 
 <SECTION>
@@ -128,13 +136,6 @@ cairo_matrix_invert
 cairo_matrix_multiply
 cairo_matrix_transform_distance
 cairo_matrix_transform_point
-<SUBSECTION Private>
-cairo_matrix_create
-cairo_matrix_destroy
-cairo_matrix_copy
-cairo_matrix_set_identity
-cairo_matrix_set_affine
-cairo_matrix_get_affine
 </SECTION>
 
 <SECTION>
@@ -164,7 +165,6 @@ cairo_reference
 cairo_destroy
 cairo_save
 cairo_restore
-cairo_copy
 cairo_format_t
 cairo_operator_t
 cairo_set_operator
@@ -172,7 +172,6 @@ cairo_set_source_rgb
 cairo_set_source_rgba
 cairo_set_source
 cairo_set_source_surface
-cairo_set_alpha
 cairo_set_tolerance
 cairo_fill_rule_t
 cairo_set_fill_rule
@@ -188,7 +187,6 @@ cairo_scale
 cairo_rotate
 cairo_transform
 cairo_set_matrix
-cairo_default_matrix
 cairo_identity_matrix
 cairo_user_to_device
 cairo_user_to_device_distance
@@ -239,7 +237,6 @@ cairo_text_extents
 cairo_glyph_extents
 cairo_text_path
 cairo_glyph_path
-cairo_show_surface
 cairo_get_operator
 cairo_get_source
 cairo_get_tolerance
@@ -251,8 +248,6 @@ cairo_get_line_join
 cairo_get_miter_limit
 cairo_get_matrix
 cairo_get_target
-cairo_get_path
-cairo_get_path_flat
 cairo_copy_path
 cairo_copy_path_flat
 cairo_append_path
@@ -273,7 +268,8 @@ cairo_write_func_t
 <SUBSECTION Private>
 CAIRO_BEGIN_DECLS
 CAIRO_END_DECLS
-cairo_concat_matrix
+cairo_current_font_extents
+cairo_get_font_extents
 cairo_current_operator
 cairo_current_tolerance
 cairo_current_point
@@ -284,20 +280,54 @@ cairo_current_line_join
 cairo_current_miter_limit
 cairo_current_matrix
 cairo_current_target_surface
-cairo_current_path
-cairo_current_path_flat
-cairo_current_font_extents
-cairo_init_clip
-cairo_inverse_transform_point
-cairo_inverse_transform_distance
+cairo_get_status
+cairo_get_status_string
+cairo_concat_matrix
 cairo_scale_font
 cairo_select_font
-cairo_set_pattern
-cairo_set_rgb_color
 cairo_transform_font
-cairo_get_font_extents
-cairo_get_status
-cairo_get_status_string
 cairo_transform_point
 cairo_transform_distance
+cairo_inverse_transform_point
+cairo_inverse_transform_distance
+cairo_init_clip
+cairo_surface_create_for_image
+cairo_default_matrix
+cairo_matrix_set_affine
+cairo_matrix_set_identity
+cairo_pattern_add_color_stop
+cairo_set_rgb_color
+cairo_set_pattern
+cairo_xlib_surface_create_for_pixmap_with_visual
+cairo_xlib_surface_create_for_window_with_visual
+cairo_xcb_surface_create_for_pixmap_with_visual
+cairo_xcb_surface_create_for_window_with_visual
+cairo_current_path
+cairo_current_path_flat
+cairo_get_path
+cairo_get_path_flat
+cairo_set_alpha
+cairo_show_surface
+cairo_copy
+cairo_surface_set_repeat
+cairo_surface_set_matrix
+cairo_surface_get_matrix
+cairo_surface_set_filter
+cairo_surface_get_filter
+cairo_matrix_create
+cairo_matrix_destroy
+cairo_matrix_copy
+cairo_matrix_set_identity
+cairo_matrix_set_affine
+cairo_matrix_get_affine
+cairo_set_target_surface
+cairo_set_target_glitz
+cairo_set_target_image
+cairo_set_target_pdf
+cairo_set_target_png
+cairo_set_target_ps
+cairo_set_target_quartz
+cairo_set_target_win32
+cairo_set_target_xcb
+cairo_set_target_drawable
 </SECTION>
diff --git a/doc/public/tmpl/cairo-font.sgml b/doc/public/tmpl/cairo-font.sgml
index 66502930e..d6b4f57a5 100644
--- a/doc/public/tmpl/cairo-font.sgml
+++ b/doc/public/tmpl/cairo-font.sgml
@@ -17,132 +17,3 @@ Font Handling
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### TYPEDEF cairo_font_face_t ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### TYPEDEF cairo_scaled_font_t ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION cairo_font_face_reference ##### -->
-<para>
-
-</para>
-
-@font_face: 
-
-
-<!-- ##### FUNCTION cairo_font_face_destroy ##### -->
-<para>
-
-</para>
-
-@font_face: 
-
-
-<!-- ##### 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: 
-
-
-<!-- ##### FUNCTION cairo_scaled_font_create ##### -->
-<para>
-
-</para>
-
-@font_face: 
-@font_matrix: 
-@ctm: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_scaled_font_reference ##### -->
-<para>
-
-</para>
-
-@scaled_font: 
-<!-- # Unused Parameters # -->
-@font: 
-
-
-<!-- ##### FUNCTION cairo_scaled_font_destroy ##### -->
-<para>
-
-</para>
-
-@scaled_font: 
-<!-- # Unused Parameters # -->
-@font: 
-
-
-<!-- ##### STRUCT cairo_font_extents_t ##### -->
-<para>
-
-</para>
-
-@ascent: 
-@descent: 
-@height: 
-@max_x_advance: 
-@max_y_advance: 
-
-<!-- ##### FUNCTION cairo_scaled_font_extents ##### -->
-<para>
-
-</para>
-
-@scaled_font: 
-@extents: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@font: 
-
-
-<!-- ##### STRUCT cairo_text_extents_t ##### -->
-<para>
-
-</para>
-
-@x_bearing: 
-@y_bearing: 
-@width: 
-@height: 
-@x_advance: 
-@y_advance: 
-
-<!-- ##### FUNCTION cairo_scaled_font_glyph_extents ##### -->
-<para>
-
-</para>
-
-@scaled_font: 
-@glyphs: 
-@num_glyphs: 
-@extents: 
-<!-- # Unused Parameters # -->
-@font: 
-
-
diff --git a/doc/public/tmpl/cairo-ft.sgml b/doc/public/tmpl/cairo-ft.sgml
index d9f7cbfc1..ab266985b 100644
--- a/doc/public/tmpl/cairo-ft.sgml
+++ b/doc/public/tmpl/cairo-ft.sgml
@@ -17,39 +17,3 @@ FreeType Fonts
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_ft_font_face_create_for_pattern ##### -->
-<para>
-
-</para>
-
-@pattern: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_ft_font_face_create_for_ft_face ##### -->
-<para>
-
-</para>
-
-@face: 
-@load_flags: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_ft_scaled_font_lock_face ##### -->
-<para>
-
-</para>
-
-@scaled_font: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_ft_scaled_font_unlock_face ##### -->
-<para>
-
-</para>
-
-@scaled_font: 
-
-
diff --git a/doc/public/tmpl/cairo-glitz.sgml b/doc/public/tmpl/cairo-glitz.sgml
index 9594d87a5..c90099697 100644
--- a/doc/public/tmpl/cairo-glitz.sgml
+++ b/doc/public/tmpl/cairo-glitz.sgml
@@ -17,12 +17,3 @@ Glitz backend
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_glitz_surface_create ##### -->
-<para>
-
-</para>
-
-@surface: 
-@Returns: 
-
-
diff --git a/doc/public/tmpl/cairo-matrix.sgml b/doc/public/tmpl/cairo-matrix.sgml
index c58abe488..0fdb254aa 100644
--- a/doc/public/tmpl/cairo-matrix.sgml
+++ b/doc/public/tmpl/cairo-matrix.sgml
@@ -41,160 +41,3 @@ cairo_matrix_t
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### STRUCT cairo_matrix_t ##### -->
-<para>
-
-</para>
-
-@xx: 
-@yx: 
-@xy: 
-@yy: 
-@x0: 
-@y0: 
-
-<!-- ##### FUNCTION cairo_matrix_init ##### -->
-<para>
-
-</para>
-
-@matrix: 
-@xx: 
-@yx: 
-@xy: 
-@yy: 
-@x0: 
-@y0: 
-<!-- # Unused Parameters # -->
-@Param7: 
-@a: 
-@b: 
-@c: 
-@d: 
-@tx: 
-@ty: 
-
-
-<!-- ##### FUNCTION cairo_matrix_init_identity ##### -->
-<para>
-
-</para>
-
-@matrix: 
-
-
-<!-- ##### FUNCTION cairo_matrix_init_translate ##### -->
-<para>
-
-</para>
-
-@matrix: 
-@tx: 
-@ty: 
-
-
-<!-- ##### FUNCTION cairo_matrix_init_scale ##### -->
-<para>
-
-</para>
-
-@matrix: 
-@sx: 
-@sy: 
-
-
-<!-- ##### FUNCTION cairo_matrix_init_rotate ##### -->
-<para>
-
-</para>
-
-@matrix: 
-@radians: 
-
-
-<!-- ##### FUNCTION cairo_matrix_translate ##### -->
-<para>
-
-</para>
-
-@matrix: 
-@tx: 
-@ty: 
-<!-- # Unused Parameters # -->
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_matrix_scale ##### -->
-<para>
-
-</para>
-
-@matrix: 
-@sx: 
-@sy: 
-<!-- # Unused Parameters # -->
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_matrix_rotate ##### -->
-<para>
-
-</para>
-
-@matrix: 
-@radians: 
-<!-- # Unused Parameters # -->
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_matrix_invert ##### -->
-<para>
-
-</para>
-
-@matrix: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_matrix_multiply ##### -->
-<para>
-
-</para>
-
-@result: 
-@a: 
-@b: 
-<!-- # Unused Parameters # -->
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_matrix_transform_distance ##### -->
-<para>
-
-</para>
-
-@matrix: 
-@dx: 
-@dy: 
-<!-- # Unused Parameters # -->
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_matrix_transform_point ##### -->
-<para>
-</para>
-
-@matrix: 
-@x: 
-@y: 
-<!-- # Unused Parameters # -->
-@Returns: 
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../cairo-docs.xml" "book" "refsect2" "")
-End:
--->
-
-
diff --git a/doc/public/tmpl/cairo-pattern.sgml b/doc/public/tmpl/cairo-pattern.sgml
index 30deec9b8..3ea109264 100644
--- a/doc/public/tmpl/cairo-pattern.sgml
+++ b/doc/public/tmpl/cairo-pattern.sgml
@@ -17,154 +17,3 @@ cairo_pattern_t
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### TYPEDEF cairo_pattern_t ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION cairo_pattern_create_for_surface ##### -->
-<para>
-
-</para>
-
-@surface: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_pattern_create_linear ##### -->
-<para>
-
-</para>
-
-@x0: 
-@y0: 
-@x1: 
-@y1: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_pattern_create_radial ##### -->
-<para>
-
-</para>
-
-@cx0: 
-@cy0: 
-@radius0: 
-@cx1: 
-@cy1: 
-@radius1: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_pattern_reference ##### -->
-<para>
-
-</para>
-
-@pattern: 
-
-
-<!-- ##### FUNCTION cairo_pattern_destroy ##### -->
-<para>
-
-</para>
-
-@pattern: 
-
-
-<!-- ##### FUNCTION cairo_pattern_add_color_stop_rgb ##### -->
-<para>
-
-</para>
-
-@pattern: 
-@offset: 
-@red: 
-@green: 
-@blue: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_pattern_add_color_stop_rgba ##### -->
-<para>
-
-</para>
-
-@pattern: 
-@offset: 
-@red: 
-@green: 
-@blue: 
-@alpha: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_pattern_set_matrix ##### -->
-<para>
-
-</para>
-
-@pattern: 
-@matrix: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_pattern_get_matrix ##### -->
-<para>
-
-</para>
-
-@pattern: 
-@matrix: 
-@Returns: 
-
-
-<!-- ##### ENUM cairo_extend_t ##### -->
-<para>
-
-</para>
-
-@CAIRO_EXTEND_NONE: 
-@CAIRO_EXTEND_REPEAT: 
-@CAIRO_EXTEND_REFLECT: 
-
-<!-- ##### FUNCTION cairo_pattern_set_extend ##### -->
-<para>
-
-</para>
-
-@pattern: 
-@extend: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_pattern_get_extend ##### -->
-<para>
-
-</para>
-
-@pattern: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_pattern_set_filter ##### -->
-<para>
-
-</para>
-
-@pattern: 
-@filter: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_pattern_get_filter ##### -->
-<para>
-
-</para>
-
-@pattern: 
-@Returns: 
-
-
diff --git a/doc/public/tmpl/cairo-pdf.sgml b/doc/public/tmpl/cairo-pdf.sgml
index 2aa1473e1..2cfcdb6b6 100644
--- a/doc/public/tmpl/cairo-pdf.sgml
+++ b/doc/public/tmpl/cairo-pdf.sgml
@@ -17,24 +17,3 @@ PDF Backend
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_pdf_surface_create ##### -->
-<para>
-
-</para>
-
-@filename: 
-@width_in_points: 
-@height_in_points: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@fp: 
-@width_inches: 
-@height_inches: 
-@x_pixels_per_inch: 
-@y_pixels_per_inch: 
-@write_func: 
-@destroy_closure_func: 
-@closure: 
-@file: 
-
-
diff --git a/doc/public/tmpl/cairo-png.sgml b/doc/public/tmpl/cairo-png.sgml
index dd4486c71..8aad228fc 100644
--- a/doc/public/tmpl/cairo-png.sgml
+++ b/doc/public/tmpl/cairo-png.sgml
@@ -17,43 +17,3 @@ PNG Backend
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_image_surface_create_from_png ##### -->
-<para>
-
-</para>
-
-@filename: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_image_surface_create_from_png_stream ##### -->
-<para>
-
-</para>
-
-@read_func: 
-@closure: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_surface_write_to_png ##### -->
-<para>
-
-</para>
-
-@surface: 
-@filename: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_surface_write_to_png_stream ##### -->
-<para>
-
-</para>
-
-@surface: 
-@write_func: 
-@closure: 
-@Returns: 
-
-
diff --git a/doc/public/tmpl/cairo-ps.sgml b/doc/public/tmpl/cairo-ps.sgml
index a137f8d75..f29c50833 100644
--- a/doc/public/tmpl/cairo-ps.sgml
+++ b/doc/public/tmpl/cairo-ps.sgml
@@ -17,20 +17,3 @@ PS Backend
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_ps_surface_create ##### -->
-<para>
-
-</para>
-
-@filename: 
-@width_in_points: 
-@height_in_points: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@file: 
-@width_inches: 
-@height_inches: 
-@x_pixels_per_inch: 
-@y_pixels_per_inch: 
-
-
diff --git a/doc/public/tmpl/cairo-quartz.sgml b/doc/public/tmpl/cairo-quartz.sgml
index c83de6c77..6bccb6cc4 100644
--- a/doc/public/tmpl/cairo-quartz.sgml
+++ b/doc/public/tmpl/cairo-quartz.sgml
@@ -17,14 +17,3 @@ Quartz Backend
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_quartz_surface_create ##### -->
-<para>
-
-</para>
-
-@context: 
-@width: 
-@height: 
-@Returns: 
-
-
diff --git a/doc/public/tmpl/cairo-surface.sgml b/doc/public/tmpl/cairo-surface.sgml
index e92935a6c..35f33a31a 100644
--- a/doc/public/tmpl/cairo-surface.sgml
+++ b/doc/public/tmpl/cairo-surface.sgml
@@ -17,148 +17,3 @@ cairo_surface_t
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### TYPEDEF cairo_surface_t ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO cairo_surface_create_for_image ##### -->
-<para>
-
-</para>
-
-@Returns: 
-<!-- # Unused Parameters # -->
-@data: 
-@format: 
-@width: 
-@height: 
-@stride: 
-
-
-<!-- ##### FUNCTION cairo_surface_create_similar ##### -->
-<para>
-
-</para>
-
-@other: 
-@format: 
-@width: 
-@height: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_surface_reference ##### -->
-<para>
-
-</para>
-
-@surface: 
-
-
-<!-- ##### FUNCTION cairo_surface_destroy ##### -->
-<para>
-
-</para>
-
-@surface: 
-
-
-<!-- ##### FUNCTION cairo_surface_finish ##### -->
-<para>
-
-</para>
-
-@surface: 
-@Returns: 
-
-
-<!-- ##### MACRO cairo_surface_set_repeat ##### -->
-<para>
-
-</para>
-
-@Returns: 
-<!-- # Unused Parameters # -->
-@surface: 
-@repeat: 
-
-
-<!-- ##### MACRO cairo_surface_set_matrix ##### -->
-<para>
-
-</para>
-
-@Returns: 
-<!-- # Unused Parameters # -->
-@surface: 
-@matrix: 
-
-
-<!-- ##### MACRO cairo_surface_get_matrix ##### -->
-<para>
-
-</para>
-
-@Returns: 
-<!-- # Unused Parameters # -->
-@surface: 
-@matrix: 
-
-
-<!-- ##### MACRO cairo_surface_set_filter ##### -->
-<para>
-
-</para>
-
-@Returns: 
-<!-- # Unused Parameters # -->
-@surface: 
-@filter: 
-
-
-<!-- ##### MACRO cairo_surface_get_filter ##### -->
-<para>
-
-</para>
-
-@Returns: 
-<!-- # Unused Parameters # -->
-@surface: 
-
-
-<!-- ##### FUNCTION cairo_surface_set_user_data ##### -->
-<para>
-
-</para>
-
-@surface: 
-@key: 
-@user_data: 
-@destroy: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@data: 
-
-
-<!-- ##### FUNCTION cairo_surface_get_user_data ##### -->
-<para>
-
-</para>
-
-@surface: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_surface_set_device_offset ##### -->
-<para>
-
-</para>
-
-@surface: 
-@x_offset: 
-@y_offset: 
-
-
diff --git a/doc/public/tmpl/cairo-win32.sgml b/doc/public/tmpl/cairo-win32.sgml
new file mode 100644
index 000000000..b4ec78ff8
--- /dev/null
+++ b/doc/public/tmpl/cairo-win32.sgml
@@ -0,0 +1,21 @@
+<!-- ##### SECTION Title ##### -->
+Microsoft Windows Backend
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
diff --git a/doc/public/tmpl/cairo-xcb-xrender.sgml b/doc/public/tmpl/cairo-xcb-xrender.sgml
new file mode 100644
index 000000000..41fce0afc
--- /dev/null
+++ b/doc/public/tmpl/cairo-xcb-xrender.sgml
@@ -0,0 +1,21 @@
+<!-- ##### SECTION Title ##### -->
+XCB Backend
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
diff --git a/doc/public/tmpl/cairo-xcb.sgml b/doc/public/tmpl/cairo-xcb.sgml
index 25b2f0aa1..47b5c2d9f 100644
--- a/doc/public/tmpl/cairo-xcb.sgml
+++ b/doc/public/tmpl/cairo-xcb.sgml
@@ -17,20 +17,3 @@ XCB Backend
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_xcb_surface_create ##### -->
-<para>
-
-</para>
-
-@c: 
-@pixmap: 
-@visual: 
-@width: 
-@height: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@dpy: 
-@drawable: 
-@format: 
-
-
diff --git a/doc/public/tmpl/cairo-xlib-xrender.sgml b/doc/public/tmpl/cairo-xlib-xrender.sgml
new file mode 100644
index 000000000..493fdfddd
--- /dev/null
+++ b/doc/public/tmpl/cairo-xlib-xrender.sgml
@@ -0,0 +1,21 @@
+<!-- ##### SECTION Title ##### -->
+XLib/Xrender Backend
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
diff --git a/doc/public/tmpl/cairo-xlib.sgml b/doc/public/tmpl/cairo-xlib.sgml
index 2357ea4c3..887077a76 100644
--- a/doc/public/tmpl/cairo-xlib.sgml
+++ b/doc/public/tmpl/cairo-xlib.sgml
@@ -17,29 +17,3 @@ XLib Backend
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_xlib_surface_create ##### -->
-<para>
-
-</para>
-
-@dpy: 
-@drawable: 
-@visual: 
-@width: 
-@height: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@format: 
-@colormap: 
-
-
-<!-- ##### FUNCTION cairo_xlib_surface_set_size ##### -->
-<para>
-
-</para>
-
-@surface: 
-@width: 
-@height: 
-
-
diff --git a/doc/public/tmpl/cairo.sgml b/doc/public/tmpl/cairo.sgml
index 6deaeb580..6400638fe 100644
--- a/doc/public/tmpl/cairo.sgml
+++ b/doc/public/tmpl/cairo.sgml
@@ -27,1111 +27,3 @@ Drawing contexts.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### TYPEDEF cairo_t ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION cairo_create ##### -->
-<para>
-
-</para>
-
-@target: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_reference ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_destroy ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_save ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_restore ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### MACRO cairo_copy ##### -->
-<para>
-
-</para>
-
-<!-- # Unused Parameters # -->
-@dest: 
-@src: 
-
-
-<!-- ##### ENUM cairo_format_t ##### -->
-<para>
-
-</para>
-
-@CAIRO_FORMAT_ARGB32: 
-@CAIRO_FORMAT_RGB24: 
-@CAIRO_FORMAT_A8: 
-@CAIRO_FORMAT_A1: 
-
-<!-- ##### ENUM cairo_operator_t ##### -->
-<para>
-
-</para>
-
-@CAIRO_OPERATOR_CLEAR: 
-@CAIRO_OPERATOR_SOURCE: 
-@CAIRO_OPERATOR_OVER: 
-@CAIRO_OPERATOR_IN: 
-@CAIRO_OPERATOR_OUT: 
-@CAIRO_OPERATOR_ATOP: 
-@CAIRO_OPERATOR_DEST: 
-@CAIRO_OPERATOR_DEST_OVER: 
-@CAIRO_OPERATOR_DEST_IN: 
-@CAIRO_OPERATOR_DEST_OUT: 
-@CAIRO_OPERATOR_DEST_ATOP: 
-@CAIRO_OPERATOR_XOR: 
-@CAIRO_OPERATOR_ADD: 
-@CAIRO_OPERATOR_SATURATE: 
-
-<!-- ##### FUNCTION cairo_set_operator ##### -->
-<para>
-
-</para>
-
-@cr: 
-@op: 
-
-
-<!-- ##### FUNCTION cairo_set_source_rgb ##### -->
-<para>
-
-</para>
-
-@cr: 
-@red: 
-@green: 
-@blue: 
-
-
-<!-- ##### FUNCTION cairo_set_source_rgba ##### -->
-<para>
-
-</para>
-
-@cr: 
-@red: 
-@green: 
-@blue: 
-@alpha: 
-
-
-<!-- ##### FUNCTION cairo_set_source ##### -->
-<para>
-
-</para>
-
-@cr: 
-@source: 
-<!-- # Unused Parameters # -->
-@pattern: 
-
-
-<!-- ##### FUNCTION cairo_set_source_surface ##### -->
-<para>
-
-</para>
-
-@cr: 
-@surface: 
-@x: 
-@y: 
-
-
-<!-- ##### MACRO cairo_set_alpha ##### -->
-<para>
-
-</para>
-
-<!-- # Unused Parameters # -->
-@cr: 
-@alpha: 
-
-
-<!-- ##### FUNCTION cairo_set_tolerance ##### -->
-<para>
-
-</para>
-
-@cr: 
-@tolerance: 
-
-
-<!-- ##### ENUM cairo_fill_rule_t ##### -->
-<para>
-
-</para>
-
-@CAIRO_FILL_RULE_WINDING: 
-@CAIRO_FILL_RULE_EVEN_ODD: 
-
-<!-- ##### FUNCTION cairo_set_fill_rule ##### -->
-<para>
-
-</para>
-
-@cr: 
-@fill_rule: 
-
-
-<!-- ##### FUNCTION cairo_set_line_width ##### -->
-<para>
-
-</para>
-
-@cr: 
-@width: 
-
-
-<!-- ##### ENUM cairo_line_cap_t ##### -->
-<para>
-
-</para>
-
-@CAIRO_LINE_CAP_BUTT: 
-@CAIRO_LINE_CAP_ROUND: 
-@CAIRO_LINE_CAP_SQUARE: 
-
-<!-- ##### FUNCTION cairo_set_line_cap ##### -->
-<para>
-
-</para>
-
-@cr: 
-@line_cap: 
-
-
-<!-- ##### ENUM cairo_line_join_t ##### -->
-<para>
-
-</para>
-
-@CAIRO_LINE_JOIN_MITER: 
-@CAIRO_LINE_JOIN_ROUND: 
-@CAIRO_LINE_JOIN_BEVEL: 
-
-<!-- ##### FUNCTION cairo_set_line_join ##### -->
-<para>
-
-</para>
-
-@cr: 
-@line_join: 
-
-
-<!-- ##### FUNCTION cairo_set_dash ##### -->
-<para>
-
-</para>
-
-@cr: 
-@dashes: 
-@ndash: 
-@offset: 
-
-
-<!-- ##### FUNCTION cairo_set_miter_limit ##### -->
-<para>
-
-</para>
-
-@cr: 
-@limit: 
-
-
-<!-- ##### FUNCTION cairo_translate ##### -->
-<para>
-
-</para>
-
-@cr: 
-@tx: 
-@ty: 
-
-
-<!-- ##### FUNCTION cairo_scale ##### -->
-<para>
-
-</para>
-
-@cr: 
-@sx: 
-@sy: 
-
-
-<!-- ##### FUNCTION cairo_rotate ##### -->
-<para>
-
-</para>
-
-@cr: 
-@angle: 
-
-
-<!-- ##### FUNCTION cairo_transform ##### -->
-<para>
-
-</para>
-
-@cr: 
-@matrix: 
-
-
-<!-- ##### FUNCTION cairo_set_matrix ##### -->
-<para>
-
-</para>
-
-@cr: 
-@matrix: 
-
-
-<!-- ##### MACRO cairo_default_matrix ##### -->
-<para>
-
-</para>
-
-<!-- # Unused Parameters # -->
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_identity_matrix ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_user_to_device ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x: 
-@y: 
-
-
-<!-- ##### FUNCTION cairo_user_to_device_distance ##### -->
-<para>
-
-</para>
-
-@cr: 
-@dx: 
-@dy: 
-
-
-<!-- ##### FUNCTION cairo_device_to_user ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x: 
-@y: 
-
-
-<!-- ##### FUNCTION cairo_device_to_user_distance ##### -->
-<para>
-
-</para>
-
-@cr: 
-@dx: 
-@dy: 
-
-
-<!-- ##### FUNCTION cairo_new_path ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_move_to ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x: 
-@y: 
-
-
-<!-- ##### FUNCTION cairo_line_to ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x: 
-@y: 
-
-
-<!-- ##### FUNCTION cairo_curve_to ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x1: 
-@y1: 
-@x2: 
-@y2: 
-@x3: 
-@y3: 
-
-
-<!-- ##### FUNCTION cairo_arc ##### -->
-<para>
-
-</para>
-
-@cr: 
-@xc: 
-@yc: 
-@radius: 
-@angle1: 
-@angle2: 
-
-
-<!-- ##### FUNCTION cairo_arc_negative ##### -->
-<para>
-
-</para>
-
-@cr: 
-@xc: 
-@yc: 
-@radius: 
-@angle1: 
-@angle2: 
-
-
-<!-- ##### FUNCTION cairo_rel_move_to ##### -->
-<para>
-
-</para>
-
-@cr: 
-@dx: 
-@dy: 
-
-
-<!-- ##### FUNCTION cairo_rel_line_to ##### -->
-<para>
-
-</para>
-
-@cr: 
-@dx: 
-@dy: 
-
-
-<!-- ##### FUNCTION cairo_rel_curve_to ##### -->
-<para>
-
-</para>
-
-@cr: 
-@dx1: 
-@dy1: 
-@dx2: 
-@dy2: 
-@dx3: 
-@dy3: 
-
-
-<!-- ##### FUNCTION cairo_rectangle ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x: 
-@y: 
-@width: 
-@height: 
-
-
-<!-- ##### FUNCTION cairo_close_path ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_paint ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_paint_with_alpha ##### -->
-<para>
-
-</para>
-
-@cr: 
-@alpha: 
-
-
-<!-- ##### FUNCTION cairo_mask ##### -->
-<para>
-
-</para>
-
-@cr: 
-@pattern: 
-
-
-<!-- ##### FUNCTION cairo_mask_surface ##### -->
-<para>
-
-</para>
-
-@cr: 
-@surface: 
-@surface_x: 
-@surface_y: 
-
-
-<!-- ##### FUNCTION cairo_stroke ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_stroke_preserve ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_fill ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_fill_preserve ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_copy_page ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_show_page ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_in_stroke ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x: 
-@y: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_in_fill ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x: 
-@y: 
-@Returns: 
-
-
-<!-- ##### TYPEDEF cairo_bool_t ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION cairo_stroke_extents ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x1: 
-@y1: 
-@x2: 
-@y2: 
-
-
-<!-- ##### FUNCTION cairo_fill_extents ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x1: 
-@y1: 
-@x2: 
-@y2: 
-
-
-<!-- ##### FUNCTION cairo_clip ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_clip_preserve ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### FUNCTION cairo_reset_clip ##### -->
-<para>
-
-</para>
-
-@cr: 
-
-
-<!-- ##### STRUCT cairo_glyph_t ##### -->
-<para>
-
-</para>
-
-@index: 
-@x: 
-@y: 
-
-<!-- ##### ENUM cairo_font_slant_t ##### -->
-<para>
-
-</para>
-
-@CAIRO_FONT_SLANT_NORMAL: 
-@CAIRO_FONT_SLANT_ITALIC: 
-@CAIRO_FONT_SLANT_OBLIQUE: 
-
-<!-- ##### ENUM cairo_font_weight_t ##### -->
-<para>
-
-</para>
-
-@CAIRO_FONT_WEIGHT_NORMAL: 
-@CAIRO_FONT_WEIGHT_BOLD: 
-
-<!-- ##### FUNCTION cairo_select_font_face ##### -->
-<para>
-
-</para>
-
-@cr: 
-@family: 
-@slant: 
-@weight: 
-
-
-<!-- ##### FUNCTION cairo_set_font_size ##### -->
-<para>
-
-</para>
-
-@cr: 
-@size: 
-
-
-<!-- ##### FUNCTION cairo_set_font_matrix ##### -->
-<para>
-
-</para>
-
-@cr: 
-@matrix: 
-
-
-<!-- ##### FUNCTION cairo_get_font_matrix ##### -->
-<para>
-
-</para>
-
-@cr: 
-@matrix: 
-<!-- # Unused Parameters # -->
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_show_text ##### -->
-<para>
-
-</para>
-
-@cr: 
-@utf8: 
-
-
-<!-- ##### FUNCTION cairo_show_glyphs ##### -->
-<para>
-
-</para>
-
-@cr: 
-@glyphs: 
-@num_glyphs: 
-
-
-<!-- ##### FUNCTION cairo_get_font_face ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_font_extents ##### -->
-<para>
-
-</para>
-
-@cr: 
-@extents: 
-<!-- # Unused Parameters # -->
-@font: 
-@Returns: 
-@font_matrix: 
-
-
-<!-- ##### FUNCTION cairo_set_font_face ##### -->
-<para>
-
-</para>
-
-@cr: 
-@font_face: 
-
-
-<!-- ##### FUNCTION cairo_text_extents ##### -->
-<para>
-
-</para>
-
-@cr: 
-@utf8: 
-@extents: 
-
-
-<!-- ##### FUNCTION cairo_glyph_extents ##### -->
-<para>
-
-</para>
-
-@cr: 
-@glyphs: 
-@num_glyphs: 
-@extents: 
-
-
-<!-- ##### FUNCTION cairo_text_path ##### -->
-<para>
-
-</para>
-
-@cr: 
-@utf8: 
-
-
-<!-- ##### FUNCTION cairo_glyph_path ##### -->
-<para>
-
-</para>
-
-@cr: 
-@glyphs: 
-@num_glyphs: 
-
-
-<!-- ##### MACRO cairo_show_surface ##### -->
-<para>
-
-</para>
-
-<!-- # Unused Parameters # -->
-@cr: 
-@surface: 
-@width: 
-@height: 
-
-
-<!-- ##### FUNCTION cairo_get_operator ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_get_source ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_get_tolerance ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_get_current_point ##### -->
-<para>
-
-</para>
-
-@cr: 
-@x: 
-@y: 
-
-
-<!-- ##### FUNCTION cairo_get_fill_rule ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_get_line_width ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_get_line_cap ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_get_line_join ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_get_miter_limit ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_get_matrix ##### -->
-<para>
-
-</para>
-
-@cr: 
-@matrix: 
-<!-- # Unused Parameters # -->
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_get_target ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### MACRO cairo_get_path ##### -->
-<para>
-
-</para>
-
-<!-- # Unused Parameters # -->
-@cr: 
-@move_to: 
-@line_to: 
-@curve_to: 
-@close_path: 
-@closure: 
-
-
-<!-- ##### MACRO cairo_get_path_flat ##### -->
-<para>
-
-</para>
-
-<!-- # Unused Parameters # -->
-@cr: 
-@move_to: 
-@line_to: 
-@close_path: 
-@closure: 
-
-
-<!-- ##### FUNCTION cairo_copy_path ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_copy_path_flat ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_append_path ##### -->
-<para>
-
-</para>
-
-@cr: 
-@path: 
-
-
-<!-- ##### STRUCT cairo_path_t ##### -->
-<para>
-
-</para>
-
-@data: 
-@num_data: 
-
-<!-- ##### FUNCTION cairo_path_destroy ##### -->
-<para>
-
-</para>
-
-@path: 
-
-
-<!-- ##### ENUM cairo_status_t ##### -->
-<para>
-
-</para>
-
-@CAIRO_STATUS_SUCCESS: 
-@CAIRO_STATUS_NO_MEMORY: 
-@CAIRO_STATUS_INVALID_RESTORE: 
-@CAIRO_STATUS_INVALID_POP_GROUP: 
-@CAIRO_STATUS_NO_CURRENT_POINT: 
-@CAIRO_STATUS_INVALID_MATRIX: 
-@CAIRO_STATUS_NO_TARGET_SURFACE: 
-@CAIRO_STATUS_NULL_POINTER: 
-@CAIRO_STATUS_INVALID_STRING: 
-@CAIRO_STATUS_INVALID_PATH_DATA: 
-@CAIRO_STATUS_READ_ERROR: 
-@CAIRO_STATUS_WRITE_ERROR: 
-@CAIRO_STATUS_SURFACE_FINISHED: 
-@CAIRO_STATUS_SURFACE_TYPE_MISMATCH: 
-@CAIRO_STATUS_BAD_NESTING: 
-
-<!-- ##### FUNCTION cairo_status ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_status_string ##### -->
-<para>
-
-</para>
-
-@cr: 
-@Returns: 
-
-
-<!-- ##### ENUM cairo_filter_t ##### -->
-<para>
-
-</para>
-
-@CAIRO_FILTER_FAST: 
-@CAIRO_FILTER_GOOD: 
-@CAIRO_FILTER_BEST: 
-@CAIRO_FILTER_NEAREST: 
-@CAIRO_FILTER_BILINEAR: 
-@CAIRO_FILTER_GAUSSIAN: 
-
-<!-- ##### FUNCTION cairo_image_surface_create ##### -->
-<para>
-
-</para>
-
-@format: 
-@width: 
-@height: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_image_surface_create_for_data ##### -->
-<para>
-
-</para>
-
-@data: 
-@format: 
-@width: 
-@height: 
-@stride: 
-@Returns: 
-
-
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../cairo-docs.xml" "book" "refsect2" "")
-End:
--->
-
-
-<!-- ##### FUNCTION cairo_image_surface_get_width ##### -->
-<para>
-
-</para>
-
-@surface: 
-@Returns: 
-
-
-<!-- ##### FUNCTION cairo_image_surface_get_height ##### -->
-<para>
-
-</para>
-
-@surface: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION cairo_destroy_func_t ##### -->
-<para>
-
-</para>
-
-@data: 
-
-
-<!-- ##### STRUCT cairo_user_data_key_t ##### -->
-<para>
-
-</para>
-
-@unused: 
-
-<!-- ##### USER_FUNCTION cairo_read_func_t ##### -->
-<para>
-
-</para>
-
-@closure: 
-@data: 
-@length: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION cairo_write_func_t ##### -->
-<para>
-
-</para>
-
-@closure: 
-@data: 
-@length: 
-@Returns: 
-
-
diff --git a/gtk-doc.make b/gtk-doc.make
index 18c60c2d7..91cdd34d2 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -1,9 +1,3 @@
-#
-# *** NOTE *** this file is checked into CVS for convenience only.
-# DO NOT EDIT. Rather get changes into upstream gtk-doc and then
-# update this version from the gtk-doc version.
-#
-
 # -*- mode: makefile -*-
 
 ####################################
@@ -31,7 +25,6 @@ EXTRA_DIST = 				\
 	$(content_files)		\
 	$(HTML_IMAGES)			\
 	$(DOC_MAIN_SGML_FILE)		\
-	$(DOC_MODULE).types		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
 
@@ -55,7 +48,7 @@ all-local: html-build.stamp
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	@echo '*** Scanning header files ***'
 	@-chmod -R u+w $(srcdir)
-	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
+	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
 	else \
 	    cd $(srcdir) ; \
@@ -75,7 +68,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
 tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
 	@echo '*** Rebuilding template files ***'
 	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
+	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
 	touch tmpl-build.stamp
 
 tmpl.stamp: tmpl-build.stamp
@@ -83,11 +76,11 @@ tmpl.stamp: tmpl-build.stamp
 
 #### xml ####
 
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
+sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files)
 	@echo '*** Building XML ***'
 	@-chmod -R u+w $(srcdir)
 	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS)
+	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" $(MKDB_OPTIONS)
 	touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
@@ -146,18 +139,15 @@ dist-check-gtkdoc:
 	@false
 endif
 
-# XXX: Before this was:
-# 	dist-hook: dist-check-gtkdoc dist-hook-local
-# which seems reasonable, but for some reason the dist-check-gtkdoc
-# was always failing on me, even though I do have gtk-doc installed
-# and it is successfully building the documentation.
-
-dist-hook: dist-hook-local
+dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/tmpl
 	mkdir $(distdir)/xml
 	mkdir $(distdir)/html
 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
 	-cp $(srcdir)/xml/*.xml $(distdir)/xml
 	-cp $(srcdir)/html/* $(distdir)/html
+	if test -f $(srcdir)/$(DOC_MODULE).types; then \
+	  cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
+	fi
 
 .PHONY : dist-hook-local
diff --git a/src/cairo-xcb.h b/src/cairo-xcb.h
index 57a7aebd1..17dfafa02 100644
--- a/src/cairo-xcb.h
+++ b/src/cairo-xcb.h
@@ -47,7 +47,7 @@ CAIRO_BEGIN_DECLS
 
 cairo_surface_t *
 cairo_xcb_surface_create (XCBConnection *c,
-			  XCBDRAWABLE	 pixmap,
+			  XCBDRAWABLE	 drawable,
 			  XCBVISUALTYPE *visual,
 			  int		 width,
 			  int		 height);