diff --git a/doc/public/cairo-docs.xml b/doc/public/cairo-docs.xml
index 7e441316d..487f8a8aa 100644
--- a/doc/public/cairo-docs.xml
+++ b/doc/public/cairo-docs.xml
@@ -9,7 +9,7 @@
     <title>Cairo: A Vector Graphics Library</title>
     <releaseinfo>for Cairo &version;</releaseinfo>
   </bookinfo>
-  <chapter id="Drawing">
+  <chapter id="cairo-drawing">
     <title>Drawing</title>
     <xi:include href="xml/cairo.xml"/>
     <xi:include href="xml/cairo-paths.xml"/>
@@ -17,7 +17,7 @@
     <xi:include href="xml/cairo-transforms.xml"/>
     <xi:include href="xml/cairo-text.xml"/>
   </chapter>
-  <chapter id="Fonts">
+  <chapter id="cairo-fonts">
     <title>Fonts</title>
     <xi:include href="xml/cairo-font-face.xml"/>
     <xi:include href="xml/cairo-scaled-font.xml"/>
@@ -27,7 +27,7 @@
     <xi:include href="xml/cairo-quartz-fonts.xml"/>
     <xi:include href="xml/cairo-user-fonts.xml"/>
   </chapter>
-  <chapter id="Surfaces">
+  <chapter id="cairo-surfaces">
     <title>Surfaces</title>
     <xi:include href="xml/cairo-surface.xml"/>
     <xi:include href="xml/cairo-image.xml"/>
@@ -43,15 +43,15 @@
     <!--xi:include href="xml/cairo-xcb.xml"/-->
     <xi:include href="xml/cairo-xlib.xml"/>
   </chapter>
-  <chapter id="Support">
+  <chapter id="cairo-support">
     <title>Utilities</title>
     <xi:include href="xml/cairo-matrix.xml"/>
     <xi:include href="xml/cairo-status.xml"/>
     <xi:include href="xml/cairo-version.xml"/>
     <xi:include href="xml/cairo-types.xml"/>
   </chapter>
-  <index>
-    <title id="index-all">Index</title>
+  <index id="index-all">
+    <title>Index</title>
   </index>
   <index id="index-1.2" role="1.2">
     <title>Index of new symbols in 1.2</title>
diff --git a/doc/public/cairo-sections.txt b/doc/public/cairo-sections.txt
index 9a49e4208..b2bb1f1f8 100644
--- a/doc/public/cairo-sections.txt
+++ b/doc/public/cairo-sections.txt
@@ -1,6 +1,6 @@
 <SECTION>
 <FILE>cairo-ft</FILE>
-<TITLE>FreeType Fonts</TITLE>
+<TITLE>ft-font</TITLE>
 CAIRO_HAS_FT_FONT
 cairo_ft_font_face_create_for_ft_face
 cairo_ft_font_face_create_for_pattern
@@ -11,7 +11,7 @@ cairo_ft_scaled_font_unlock_face
 
 <SECTION>
 <FILE>cairo-win32-fonts</FILE>
-<TITLE>Win32 Fonts</TITLE>
+<TITLE>win32-font</TITLE>
 CAIRO_HAS_WIN32_FONT
 cairo_win32_font_face_create_for_logfontw
 cairo_win32_font_face_create_for_hfont
@@ -25,7 +25,7 @@ cairo_win32_scaled_font_get_device_to_logical
 
 <SECTION>
 <FILE>cairo-quartz-fonts</FILE>
-<TITLE>Quartz Fonts</TITLE>
+<TITLE>quartz-font</TITLE>
 CAIRO_HAS_QUARTZ_FONT
 cairo_quartz_font_face_create_for_cgfont
 cairo_quartz_font_face_create_for_atsu_font_id
@@ -33,7 +33,7 @@ cairo_quartz_font_face_create_for_atsu_font_id
 
 <SECTION>
 <FILE>cairo-user-fonts</FILE>
-<TITLE>User Fonts</TITLE>
+<TITLE>user-font</TITLE>
 cairo_user_scaled_font_init_func_t
 cairo_user_scaled_font_render_glyph_func_t
 cairo_user_scaled_font_text_to_glyphs_func_t
@@ -51,7 +51,7 @@ cairo_user_font_face_get_text_to_glyphs_func
 
 <SECTION>
 <FILE>cairo-image</FILE>
-<TITLE>Image Surfaces</TITLE>
+<TITLE>image-surface</TITLE>
 cairo_format_t
 cairo_format_stride_for_width
 cairo_image_surface_create
@@ -65,7 +65,7 @@ cairo_image_surface_get_stride
 
 <SECTION>
 <FILE>cairo-pdf</FILE>
-<TITLE>PDF Surfaces</TITLE>
+<TITLE>pdf-surface</TITLE>
 CAIRO_HAS_PDF_SURFACE
 cairo_pdf_surface_create
 cairo_pdf_surface_create_for_stream
@@ -74,7 +74,7 @@ cairo_pdf_surface_set_size
 
 <SECTION>
 <FILE>cairo-png</FILE>
-<TITLE>PNG Support</TITLE>
+<TITLE>png-functions</TITLE>
 CAIRO_HAS_PNG_FUNCTIONS
 cairo_image_surface_create_from_png
 cairo_read_func_t
@@ -86,7 +86,7 @@ cairo_surface_write_to_png_stream
 
 <SECTION>
 <FILE>cairo-ps</FILE>
-<TITLE>PostScript Surfaces</TITLE>
+<TITLE>ps-surface</TITLE>
 CAIRO_HAS_PS_SURFACE
 cairo_ps_surface_create
 cairo_ps_surface_create_for_stream
@@ -104,7 +104,7 @@ cairo_ps_surface_dsc_comment
 
 <SECTION>
 <FILE>cairo-win32</FILE>
-<TITLE>Win32 Surfaces</TITLE>
+<TITLE>win32-surface</TITLE>
 CAIRO_HAS_WIN32_SURFACE
 cairo_win32_surface_create
 cairo_win32_surface_create_with_dib
@@ -116,7 +116,7 @@ cairo_win32_surface_get_image
 
 <SECTION>
 <FILE>cairo-quartz</FILE>
-<TITLE>Quartz Surfaces</TITLE>
+<TITLE>quartz-surface</TITLE>
 CAIRO_HAS_QUARTZ_SURFACE
 cairo_quartz_surface_create
 cairo_quartz_surface_create_for_cg_context
@@ -128,7 +128,7 @@ cairo_quartz_image_surface_get_image
 
 <SECTION>
 <FILE>cairo-xlib</FILE>
-<TITLE>XLib Surfaces</TITLE>
+<TITLE>xlib-surface</TITLE>
 CAIRO_HAS_XLIB_SURFACE
 cairo_xlib_surface_create
 cairo_xlib_surface_create_for_bitmap
@@ -145,7 +145,7 @@ cairo_xlib_surface_get_depth
 
 <SECTION>
 <FILE>cairo-xlib-xrender</FILE>
-<TITLE>XLib/Xrender Backend</TITLE>
+<TITLE>xlib-xrender-surface</TITLE>
 CAIRO_HAS_XLIB_XRENDER_SURFACE
 cairo_xlib_surface_create_with_xrender_format
 cairo_xlib_surface_get_xrender_format
@@ -153,7 +153,7 @@ cairo_xlib_surface_get_xrender_format
 
 <SECTION>
 <FILE>cairo-svg</FILE>
-<TITLE>SVG Surfaces</TITLE>
+<TITLE>svg-surface</TITLE>
 CAIRO_HAS_SVG_SURFACE
 cairo_svg_surface_create
 cairo_svg_surface_create_for_stream
@@ -165,7 +165,7 @@ cairo_svg_version_to_string
 
 <SECTION>
 <FILE>cairo-surface</FILE>
-<TITLE>cairo_surface_t</TITLE>
+<TITLE>surface</TITLE>
 cairo_surface_t
 cairo_content_t
 cairo_surface_create_similar
@@ -194,7 +194,7 @@ cairo_surface_has_show_text_glyphs
 
 <SECTION>
 <FILE>cairo-version</FILE>
-<TITLE>Version Information</TITLE>
+<TITLE>version-info</TITLE>
 CAIRO_VERSION
 CAIRO_VERSION_MAJOR
 CAIRO_VERSION_MINOR
@@ -210,7 +210,7 @@ CAIRO_VERSION_STRINGIZE_
 
 <SECTION>
 <FILE>cairo-pattern</FILE>
-<TITLE>Patterns</TITLE>
+<TITLE>pattern</TITLE>
 cairo_pattern_t
 cairo_pattern_add_color_stop_rgb
 cairo_pattern_add_color_stop_rgba
@@ -245,7 +245,7 @@ cairo_pattern_get_user_data
 
 <SECTION>
 <FILE>cairo-matrix</FILE>
-<TITLE>cairo_matrix_t</TITLE>
+<TITLE>matrix</TITLE>
 cairo_matrix_t
 cairo_matrix_init
 cairo_matrix_init_identity
@@ -263,7 +263,7 @@ cairo_matrix_transform_point
 
 <SECTION>
 <FILE>cairo-status</FILE>
-<TITLE>Error Handling</TITLE>
+<TITLE>error-status</TITLE>
 cairo_status_t
 cairo_status_to_string
 cairo_debug_reset_static_data
@@ -271,7 +271,7 @@ cairo_debug_reset_static_data
 
 <SECTION>
 <FILE>cairo-font-face</FILE>
-<TITLE>cairo_font_face_t</TITLE>
+<TITLE>font-face</TITLE>
 cairo_font_face_t
 cairo_font_face_reference
 cairo_font_face_destroy
@@ -285,7 +285,7 @@ cairo_font_face_get_user_data
 
 <SECTION>
 <FILE>cairo-scaled-font</FILE>
-<TITLE>Scaled Fonts</TITLE>
+<TITLE>scaled-font</TITLE>
 cairo_scaled_font_t
 cairo_scaled_font_create
 cairo_scaled_font_reference
@@ -310,7 +310,7 @@ cairo_scaled_font_get_user_data
 
 <SECTION>
 <FILE>cairo-font-options</FILE>
-<TITLE>Font Options</TITLE>
+<TITLE>font-options</TITLE>
 cairo_font_options_t
 cairo_font_options_create
 cairo_font_options_copy
@@ -337,7 +337,7 @@ cairo_font_options_get_hint_metrics
 
 <SECTION>
 <FILE>cairo-types</FILE>
-<TITLE>Types</TITLE>
+<TITLE>types</TITLE>
 cairo_bool_t
 cairo_user_data_key_t
 cairo_destroy_func_t
@@ -345,7 +345,7 @@ cairo_destroy_func_t
 
 <SECTION>
 <FILE>cairo-transforms</FILE>
-<TITLE>Transformations</TITLE>
+<TITLE>transformations</TITLE>
 cairo_translate
 cairo_scale
 cairo_rotate
@@ -362,7 +362,7 @@ cairo_device_to_user_distance
 
 <SECTION>
 <FILE>cairo-paths</FILE>
-<TITLE>Paths</TITLE>
+<TITLE>paths</TITLE>
 cairo_path_t
 cairo_path_data_t
 cairo_path_data_type_t
@@ -391,7 +391,7 @@ cairo_path_extents
 
 <SECTION>
 <FILE>cairo-text</FILE>
-<TITLE>Text</TITLE>
+<TITLE>text</TITLE>
 cairo_glyph_t
 cairo_font_slant_t
 cairo_font_weight_t
@@ -425,7 +425,7 @@ cairo_text_cluster_free
 
 <SECTION>
 <FILE>cairo</FILE>
-<TITLE>cairo_t</TITLE>
+<TITLE>context</TITLE>
 cairo_t
 cairo_create
 cairo_reference