7 files changed, 1 insertions, 76 deletions
diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index d8f2c05e..51b69bcb 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -692,40 +692,6 @@ PangoRendererPrivate
 </SECTION>
 
 <SECTION>
-<TITLE>X Fonts and Rendering</TITLE>
-<FILE>x-fonts</FILE>
-PANGO_RENDER_TYPE_X
-pango_x_get_context
-pango_x_context_set_funcs
-PangoGetGCFunc
-PangoFreeGCFunc
-pango_x_render
-pango_x_render_layout_line
-pango_x_render_layout
-PangoXSubfont
-PANGO_X_MAKE_GLYPH
-PANGO_X_GLYPH_SUBFONT
-PANGO_X_GLYPH_INDEX
-pango_x_load_font
-pango_x_get_unknown_glyph
-pango_x_has_glyph
-pango_x_list_subfonts
-pango_x_font_map_for_display
-pango_x_shutdown_display
-pango_x_font_map_get_font_cache
-pango_x_font_subfont_xlfd
-pango_x_find_first_subfont
-pango_x_font_get_unknown_glyph
-pango_x_apply_ligatures
-pango_x_fallback_shape
-PangoXFontCache
-pango_x_font_cache_new
-pango_x_font_cache_free
-pango_x_font_cache_load
-pango_x_font_cache_unload
-</SECTION>
-
-<SECTION>
 <TITLE>Win32 Fonts and Rendering</TITLE>
 <FILE>win32-fonts</FILE>
 PANGO_RENDER_TYPE_WIN32
diff --git a/docs/tmpl/fonts.sgml b/docs/tmpl/fonts.sgml
index d4ce3160..5e7402d7 100644
--- a/docs/tmpl/fonts.sgml
+++ b/docs/tmpl/fonts.sgml
@@ -442,15 +442,6 @@ the documentation of the corresponding getters for documentation
 of their meaning.
 </para>
 
-@ref_count: 
-@ascent: 
-@descent: 
-@approximate_char_width: 
-@approximate_digit_width: 
-@underline_position: 
-@underline_thickness: 
-@strikethrough_position: 
-@strikethrough_thickness: 
 
 <!-- ##### MACRO PANGO_TYPE_FONT_METRICS ##### -->
 <para>
diff --git a/docs/tmpl/glyphs.sgml b/docs/tmpl/glyphs.sgml
index 5d4be350..926bf539 100644
--- a/docs/tmpl/glyphs.sgml
+++ b/docs/tmpl/glyphs.sgml
@@ -168,12 +168,6 @@ horizontal origin.
 
 </para>
 
-@xx: 
-@xy: 
-@yx: 
-@yy: 
-@x0: 
-@y0: 
 
 <!-- ##### MACRO PANGO_TYPE_MATRIX ##### -->
 <para>
@@ -395,9 +389,6 @@ The storage for the glyph information is owned
 by the structure which simplifies memory management.
 </para>
 
-@num_glyphs: 
-@glyphs: 
-@log_clusters: 
 
 <!-- ##### STRUCT PangoGlyphItem ##### -->
 <para>
@@ -408,8 +399,6 @@ of shaping text with #PangoLayout is a list of #PangoLayoutLine,
 each of which contains a list of #PangoGlyphItem.
 </para>
 
-@item: 
-@glyphs: 
 
 <!-- ##### STRUCT PangoGlyphItemIter ##### -->
 <para>
@@ -453,14 +442,6 @@ None of the members of a #PangoGlyphItemIter should be modified manually.
 
 </para>
 
-@glyph_item: 
-@text: 
-@start_glyph: 
-@start_index: 
-@start_char: 
-@end_glyph: 
-@end_index: 
-@end_char: 
 @Since: 1.22
 
 <!-- ##### MACRO PANGO_TYPE_GLYPH_STRING ##### -->
diff --git a/docs/tmpl/layout.sgml b/docs/tmpl/layout.sgml
index a3f22a03..997507df 100644
--- a/docs/tmpl/layout.sgml
+++ b/docs/tmpl/layout.sgml
@@ -845,12 +845,6 @@ Routines for rendering PangoLayout objects are provided in
 code specific to each rendering system.
 </para>
 
-@layout: 
-@start_index: 
-@length: 
-@runs: 
-@is_paragraph_start: 
-@resolved_dir: 
 
 <!-- ##### TYPEDEF PangoLayoutRun ##### -->
 <para>
diff --git a/docs/tmpl/main.sgml b/docs/tmpl/main.sgml
index f3759cec..112baaaf 100644
--- a/docs/tmpl/main.sgml
+++ b/docs/tmpl/main.sgml
@@ -36,10 +36,6 @@ The #PangoItem structure stores information about
 a segment of text. It contains the following fields:
 </para>
 
-@offset: 
-@length: 
-@num_chars: 
-@analysis: 
 
 <!-- ##### STRUCT PangoAnalysis ##### -->
 <para>
diff --git a/docs/tmpl/tab-stops.sgml b/docs/tmpl/tab-stops.sgml
index 62b02020..0e28a72e 100644
--- a/docs/tmpl/tab-stops.sgml
+++ b/docs/tmpl/tab-stops.sgml
@@ -68,7 +68,7 @@ The #GObject type for #PangoTabAlign.
 @positions_in_pixels: 
 @first_alignment: 
 @first_position: 
-@Varargs: 
+@...: 
 @Returns: 
 
 
diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml
index edcd3ec9..1f58e0dc 100644
--- a/docs/tmpl/text-attributes.sgml
+++ b/docs/tmpl/text-attributes.sgml
@@ -580,9 +580,6 @@ The #PangoColor structure is used to
 represent a color in an uncalibrated RGB color-space.
 </para>
 
-@red: 
-@green: 
-@blue: 
 
 <!-- ##### MACRO PANGO_TYPE_COLOR ##### -->
 <para>