Various documentation improvements.

2005-11-16  Behdad Esfahbod  <behdad@gnome.org>

        * docs/pango_markup.sgml docs/tmpl/coverage-maps.sgml
        docs/tmpl/engines.sgml docs/tmpl/fonts.sgml
        docs/tmpl/freetype-fonts.sgml docs/tmpl/glyphs.sgml
        docs/tmpl/layout.sgml docs/tmpl/main.sgml
        docs/tmpl/modules.sgml docs/tmpl/opentype.sgml
        docs/tmpl/pango-engine-lang.sgml
        docs/tmpl/pango-engine-shape.sgml
        docs/tmpl/pango-renderer.sgml docs/tmpl/pangocairo.sgml
        docs/tmpl/pangofc-decoder.sgml docs/tmpl/pangofc-font.sgml
        docs/tmpl/pangofc-fontmap.sgml docs/tmpl/scripts.sgml
        docs/tmpl/tab-stops.sgml docs/tmpl/text-attributes.sgml
        docs/tmpl/win32-fonts.sgml docs/tmpl/x-fonts.sgml
        docs/tmpl/xft-fonts.sgml pango/break.c pango/ellipsize.c
        pango/fonts.c pango/pango-attributes.c pango/pango-color.c
        pango/pango-context.c pango/pango-coverage.c
        pango/pango-fontmap.c pango/pango-glyph-item.c
        pango/pango-layout.c pango/pango-markup.c pango/pango-tabs.c
        pango/pango-types.h pango/pango-utils.c
        pango/pangoft2-render.c pango/pangox.c pango/pangoxft-render.c:
        Various documentation improvements.

23 files changed, 60 insertions, 114 deletions

diff --git a/docs/pango_markup.sgml b/docs/pango_markup.sgml
index 3b4c1a5c..72b0179d 100644
--- a/docs/pango_markup.sgml
+++ b/docs/pango_markup.sgml
@@ -1,12 +1,12 @@
 <refentry id="PangoMarkupFormat" revision="11 Dec 2002">
 <refmeta>
-<refentrytitle>Pango Text Attribute Markup</refentrytitle>
+<refentrytitle>Text Attribute Markup</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>Pango Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>Pango Text Attribute Markup</refname><refpurpose>Simple
+<refname>Text Attribute Markup</refname><refpurpose>Simple
 markup language to encode text with attributes</refpurpose>
 </refnamediv>
 
diff --git a/docs/tmpl/coverage-maps.sgml b/docs/tmpl/coverage-maps.sgml
index 5dc89ff1..d673d65e 100644
--- a/docs/tmpl/coverage-maps.sgml
+++ b/docs/tmpl/coverage-maps.sgml
@@ -17,9 +17,6 @@ to represent that information.
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### ENUM PangoCoverageLevel ##### -->
 <para>
 Used to indicate how well a font can represent a particular ISO 10646
diff --git a/docs/tmpl/engines.sgml b/docs/tmpl/engines.sgml
index 063c7454..fb7fdfd2 100644
--- a/docs/tmpl/engines.sgml
+++ b/docs/tmpl/engines.sgml
@@ -28,9 +28,6 @@ function is used when building a catalog of all available modules.
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### STRUCT PangoEngineInfo ##### -->
 <para>
 The #PangoEngineInfo structure contains information about a particular
diff --git a/docs/tmpl/fonts.sgml b/docs/tmpl/fonts.sgml
index 4e5caa62..34232cfa 100644
--- a/docs/tmpl/fonts.sgml
+++ b/docs/tmpl/fonts.sgml
@@ -19,9 +19,6 @@ to load a font of a given description.
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### STRUCT PangoFontDescription ##### -->
 <para>
 The #PangoFontDescription structure represents the description
@@ -535,7 +532,7 @@ pango_font_init() on the structure.
 </para>
 <para>
 The #PangoFont structure contains one member
-which the implementation fills in:
+which the implementation fills in.
 </para>
 
 
@@ -751,7 +748,8 @@ pointer to a appropriate #PangoFontMapClass, then call
 pango_font_map_init() on the structure.
 </para>
 <para>
-The #PangoFont structure contains one member which the implementation fills in:
+The #PangoFontMap structure contains one member which the implementation
+fills in.
 </para>
 
 
@@ -932,10 +930,10 @@ a particular #PangoFontset implementation.
 
 <!-- ##### STRUCT PangoFontsetSimple ##### -->
 <para>
-#PangoFontSetSimple is a implementation of the abstract
-#PangoFontSet base class in terms of an array of fonts,
+#PangoFontsetSimple is a implementation of the abstract
+#PangoFontset base class in terms of an array of fonts,
 which the creator provides when constructing the
-#PangoFontSetSimple.
+#PangoFontsetSimple.
 </para>
 
 
diff --git a/docs/tmpl/freetype-fonts.sgml b/docs/tmpl/freetype-fonts.sgml
index b554fe57..9877c200 100644
--- a/docs/tmpl/freetype-fonts.sgml
+++ b/docs/tmpl/freetype-fonts.sgml
@@ -14,9 +14,6 @@ Functions for shape engines to manipulate FreeType fonts
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### STRUCT PangoFT2FontMap ##### -->
 <para>
 The #PangoFT2FontMap is the #PangoFontMap implementation for FreeType fonts.
diff --git a/docs/tmpl/glyphs.sgml b/docs/tmpl/glyphs.sgml
index 0f9c1bfe..a25e5895 100644
--- a/docs/tmpl/glyphs.sgml
+++ b/docs/tmpl/glyphs.sgml
@@ -17,15 +17,12 @@ glyphs.
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### MACRO PANGO_SCALE ##### -->
 <para>
-The PANGO_SCALE macro represents the scale between dimensions used
+The %PANGO_SCALE macro represents the scale between dimensions used
 for Pango distances and device units. (The definition of device
 units is dependent on the output device; it will typically be pixels
-for a screen, and points for a printer.) PANGO_SCALE is currently
+for a screen, and points for a printer.) %PANGO_SCALE is currently
 1024, but this may be changed in the future.
 </para>
 <para>
@@ -214,12 +211,12 @@ information for a single glyph.
 <!-- ##### TYPEDEF PangoGlyphUnit ##### -->
 <para>
 The #PangoGlyphUnit type is used to store dimensions within
-Pango. Dimensions are stored in 1/PANGO_SCALE of a device unit.
+Pango. Dimensions are stored in 1/%PANGO_SCALE of a device unit.
 (A device unit might be a pixel for screen display, or
-a point on a printer.) PANGO_SCALE is currently 1024, and
-is unlikely to change, but you should not depend on its
-exact value. The PANGO_PIXELS() macro can be used to convert
-from glyph units into device units with correct rounding.
+a point on a printer.) %PANGO_SCALE is currently 1024, and
+may change in the future (unlikely though), but you should not
+depend on its exact value. The PANGO_PIXELS() macro can be used
+to convert from glyph units into device units with correct rounding.
 </para>
 
 
diff --git a/docs/tmpl/layout.sgml b/docs/tmpl/layout.sgml
index 8b84b65d..d358115a 100644
--- a/docs/tmpl/layout.sgml
+++ b/docs/tmpl/layout.sgml
@@ -9,7 +9,7 @@ Highlevel layout driver objects
 While complete access to the layout capabilities of Pango is provided
 using the detailed interfaces for itemization and shaping, using
 that functionality directly involves writing a fairly large amount
-of code. The objects and functions in this structure provide a
+of code. The objects and functions in this section provide a
 high-level driver for formatting entire paragraphs of text
 at once.
 </para>
@@ -19,9 +19,6 @@ at once.
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### STRUCT PangoLayout ##### -->
 <para>
 The #PangoLayout structure represents and entire paragraph
@@ -53,11 +50,11 @@ fields.
 
 <!-- ##### STRUCT PangoLayoutIter ##### -->
 <para>
-A <structname>PangoLayoutIter</structname> structure can be used to
+A #PangoLayoutIter structure can be used to
 iterate over the visual extents of a #PangoLayout. 
 </para>
 <para>
-The <structname>PangoLayoutIter</structname> structure is opaque, and 
+The #PangoLayoutIter structure is opaque, and 
 has no user-visible fields.
 </para>
 
diff --git a/docs/tmpl/main.sgml b/docs/tmpl/main.sgml
index 4f373d4b..0f5695f6 100644
--- a/docs/tmpl/main.sgml
+++ b/docs/tmpl/main.sgml
@@ -17,9 +17,6 @@ various steps of this process.
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### STRUCT PangoContext ##### -->
 <para>
 The #PangoContext structure stores global information
@@ -296,6 +293,15 @@ The GObject type for #PangoDirection.
 @Returns: 
 
 
+<!-- ##### FUNCTION pango_unichar_direction ##### -->
+<para>
+
+</para>
+
+@ch: 
+@Returns: 
+
+
 <!-- ##### FUNCTION pango_find_base_dir ##### -->
 <para>
 
@@ -378,7 +384,7 @@ about the attributes of a single character.
                               (e.g.  letter + diacritics) is considered a
                               unit, while in others, each decomposed
                               character in the grapheme is a unit. In the
-                              default implementation of #pango_break, this
+                              default implementation of pango_break(), this
                               bit is set on all grapheme boundaries except
                               those following Latin, Cyrillic or Greek base
                               characters.
diff --git a/docs/tmpl/modules.sgml b/docs/tmpl/modules.sgml
index a4dd32ac..2d74a8ad 100644
--- a/docs/tmpl/modules.sgml
+++ b/docs/tmpl/modules.sgml
@@ -14,9 +14,6 @@ Support for loadable modules
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### STRUCT PangoIncludedModule ##### -->
 <para>
 The #PangoIncludedModule structure for a statically linked module 
diff --git a/docs/tmpl/opentype.sgml b/docs/tmpl/opentype.sgml
index fde93bee..8cfe4405 100644
--- a/docs/tmpl/opentype.sgml
+++ b/docs/tmpl/opentype.sgml
@@ -14,9 +14,6 @@ Obtaining information from OpenType tables
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### TYPEDEF PangoOTTag ##### -->
 <para>
 The <type>PangoOTTag</type> typedef is used to represent TrueType and OpenType
@@ -28,10 +25,10 @@ create <type>PangoOTTag</type>s manually.
 
 <!-- ##### STRUCT PangoOTInfo ##### -->
 <para>
-The <structname>PangoOTInfo</structname> struct contains the various 
+The #PangoOTInfo struct contains the various 
 tables associated with an OpenType font. It contains only private fields and
 should only be accessed via the <function>pango_ot_info_*</function> functions
-which are documented below. To obtain a <structname>PangoOTInfo</structname>,
+which are documented below. To obtain a #PangoOTInfo,
 use pango_ot_info_new().
 </para>
 
@@ -56,11 +53,11 @@ use pango_ot_info_new().
 
 <!-- ##### STRUCT PangoOTRuleset ##### -->
 <para>
-The <structname>PangoOTRuleSet</structname> structure holds a
+The #PangoOTRuleSet structure holds a
 set of features selected from the tables in an OpenType font.
 (A feature is an operation such as adjusting glyph positioning
 that should be applied to a text feature such as a certain
-type of accent.) A <structname>PangoOTRuleSet</structname>
+type of accent.) A #PangoOTRuleSet
 is created with pango_ot_ruleset_new(), features are addded
 to it with pango_ot_ruleset_add_feature(), then it is
 applied to a #PangoGlyphString with pango_ot_ruleset_shape().
diff --git a/docs/tmpl/pango-engine-lang.sgml b/docs/tmpl/pango-engine-lang.sgml
index 42ddfb07..79b08f21 100644
--- a/docs/tmpl/pango-engine-lang.sgml
+++ b/docs/tmpl/pango-engine-lang.sgml
@@ -14,9 +14,6 @@ Rendering-system independent script engines
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### STRUCT PangoEngineLang ##### -->
 <para>
 </para>
diff --git a/docs/tmpl/pango-engine-shape.sgml b/docs/tmpl/pango-engine-shape.sgml
index 8b6c8b98..d1aff7d0 100644
--- a/docs/tmpl/pango-engine-shape.sgml
+++ b/docs/tmpl/pango-engine-shape.sgml
@@ -14,9 +14,6 @@ Rendering-system dependent script engines
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### STRUCT PangoEngineShape ##### -->
 <para>
 </para>
diff --git a/docs/tmpl/pango-renderer.sgml b/docs/tmpl/pango-renderer.sgml
index 5ffd48bc..f88a679b 100644
--- a/docs/tmpl/pango-renderer.sgml
+++ b/docs/tmpl/pango-renderer.sgml
@@ -18,9 +18,6 @@ destinations can be created.
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### STRUCT PangoRenderer ##### -->
 <para>
 
diff --git a/docs/tmpl/pangocairo.sgml b/docs/tmpl/pangocairo.sgml
index da1d7e3f..0c58c923 100644
--- a/docs/tmpl/pangocairo.sgml
+++ b/docs/tmpl/pangocairo.sgml
@@ -139,9 +139,6 @@ int main (int argc, char **argv)
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### STRUCT PangoCairoFontMap ##### -->
 <para>
 
diff --git a/docs/tmpl/pangofc-decoder.sgml b/docs/tmpl/pangofc-decoder.sgml
index b8191c73..ad033b6a 100644
--- a/docs/tmpl/pangofc-decoder.sgml
+++ b/docs/tmpl/pangofc-decoder.sgml
@@ -15,9 +15,6 @@ for handling a font that is encoded in a custom way.
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### STRUCT PangoFcDecoder ##### -->
 <para>
 
diff --git a/docs/tmpl/pangofc-font.sgml b/docs/tmpl/pangofc-font.sgml
index 6bea63f4..c87b2617 100644
--- a/docs/tmpl/pangofc-font.sgml
+++ b/docs/tmpl/pangofc-font.sgml
@@ -31,9 +31,6 @@ Fontconfig-based backend involves deriving from both
 </variablelist>
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### STRUCT PangoFcFont ##### -->
 <para>
 
diff --git a/docs/tmpl/pangofc-fontmap.sgml b/docs/tmpl/pangofc-fontmap.sgml
index e24dc050..34c99b77 100644
--- a/docs/tmpl/pangofc-fontmap.sgml
+++ b/docs/tmpl/pangofc-fontmap.sgml
@@ -31,9 +31,6 @@ Fontconfig-based backend involves deriving from both
 </variablelist>
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### STRUCT PangoFcFontMap ##### -->
 <para>
 
diff --git a/docs/tmpl/scripts.sgml b/docs/tmpl/scripts.sgml
index 6c6fd580..f68c9341 100644
--- a/docs/tmpl/scripts.sgml
+++ b/docs/tmpl/scripts.sgml
@@ -16,9 +16,6 @@ and of ranges within a larger text string.
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### STRUCT PangoScriptIter ##### -->
 <para>
 
diff --git a/docs/tmpl/tab-stops.sgml b/docs/tmpl/tab-stops.sgml
index d131b162..b06289b8 100644
--- a/docs/tmpl/tab-stops.sgml
+++ b/docs/tmpl/tab-stops.sgml
@@ -2,7 +2,7 @@
 Tab Stops
 
 <!-- ##### SECTION Short_Description ##### -->
-Structures for storing Tab Stops
+Structures for storing tab stops
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
@@ -14,12 +14,9 @@ Structures for storing Tab Stops
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### STRUCT PangoTabArray ##### -->
 <para>
-A <structname>PangoTabArray</structname> struct contains an array
+A #PangoTabArray struct contains an array
 of tab stops. Each tab stop has an alignment and a position.
 </para>
 
diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml
index f69700f7..8d56424b 100644
--- a/docs/tmpl/text-attributes.sgml
+++ b/docs/tmpl/text-attributes.sgml
@@ -18,11 +18,9 @@ of attributes applied to a portion of text.
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### ENUM PangoAttrType ##### -->
 <para>
+The #PangoAttrType
 distinguishes between different types of attributes. Along with the
 predefined values, it is possible to allocate additional values
 for custom attributes using pango_attr_type_register(). The predefined
@@ -37,7 +35,7 @@ attribute is listed in parentheses after the description.
 @PANGO_ATTR_WEIGHT: font weight (#PangoAttrInt)
 @PANGO_ATTR_VARIANT: font variant (normal or small caps) (#PangoAttrInt)
 @PANGO_ATTR_STRETCH: font stretch (#PangoAttrInt)
-@PANGO_ATTR_SIZE: font size in points divided by PANGO_SCALE (#PangoAttrInt)
+@PANGO_ATTR_SIZE: font size in points divided by %PANGO_SCALE (#PangoAttrInt)
 @PANGO_ATTR_FONT_DESC: font description (#PangoAttrFontDesc)
 @PANGO_ATTR_FOREGROUND: foreground color (#PangoAttrColor)
 @PANGO_ATTR_BACKGROUND: background color (#PangoAttrColor)
@@ -45,7 +43,7 @@ attribute is listed in parentheses after the description.
 @PANGO_ATTR_STRIKETHROUGH: whether the text is struck-through (#PangoAttrInt)
 @PANGO_ATTR_RISE: baseline displacement (#PangoAttrInt)
 @PANGO_ATTR_SHAPE: shape (#PangoAttrShape)
-@PANGO_ATTR_SCALE: font size scale factor (#PangoAttrScale)
+@PANGO_ATTR_SCALE: font size scale factor (#PangoAttrFloat)
 @PANGO_ATTR_FALLBACK: whether fallback is enabled (#PangoAttrInt)
 @PANGO_ATTR_LETTER_SPACING: 
 @PANGO_ATTR_UNDERLINE_COLOR: 
@@ -84,7 +82,7 @@ applies.
 @klass: the class structure holding information about the type of the attribute
 @start_index: the start index of the range (in bytes).
 @end_index: end index of the range (in bytes). The character at this index
-	not included in the range.
+	is not included in the range.
 
 <!-- ##### STRUCT PangoAttrString ##### -->
 <para>
@@ -97,7 +95,7 @@ a string value.
 
 <!-- ##### STRUCT PangoAttrLanguage ##### -->
 <para>
-The #PangoAttrColor structure is used to represent attributes that
+The #PangoAttrLanguage structure is used to represent attributes that
 are languages.
 </para>
 
@@ -116,7 +114,7 @@ are colors.
 <!-- ##### STRUCT PangoAttrInt ##### -->
 <para>
 The #PangoAttrInt structure is used to represent attributes with
-a integer or enumeration value.
+an integer or enumeration value.
 </para>
 
 @attr: the common portion of the attribute
@@ -160,12 +158,12 @@ set font size.
 </para>
 
 @attr: the common portion of the attribute
-@size: size of font, in units of 1/PANGO_SCALE of a point (for
-  PANGO_ATTR_SIZE) or of a device uni (for PANGO_ATTR_ABSOLUTE_SIZE)
+@size: size of font, in units of 1/%PANGO_SCALE of a point (for
+  %PANGO_ATTR_SIZE) or of a device uni (for %PANGO_ATTR_ABSOLUTE_SIZE)
 @absolute: whether the font size is in device units or points.
    This field is only present for compatibility with Pango-1.8.0
-   (PANGO_ATTR_ABSOLUTE_SIZE was added in 1.8.1); and always will
-   be %FALSE for PANGO_ATTR_SIZE and %TRUE for PANGO_ATTR_ABSOLUTE_SIZE.
+   (%PANGO_ATTR_ABSOLUTE_SIZE was added in 1.8.1); and always will
+   be %FALSE for %PANGO_ATTR_SIZE and %TRUE for %PANGO_ATTR_ABSOLUTE_SIZE.
 
 <!-- ##### FUNCTION pango_parse_markup ##### -->
 <para>
@@ -368,9 +366,9 @@ whether text should be underlined, and if so, the type
 of underlining.
 </para>
 
-@PANGO_UNDERLINE_NONE: no underline should be drawn.
-@PANGO_UNDERLINE_SINGLE: a single underline should be drawn.
-@PANGO_UNDERLINE_DOUBLE: a double underline should be drawn.
+@PANGO_UNDERLINE_NONE: no underline should be drawn
+@PANGO_UNDERLINE_SINGLE: a single underline should be drawn
+@PANGO_UNDERLINE_DOUBLE: a double underline should be drawn
 @PANGO_UNDERLINE_LOW: a single underline should be drawn at a position
                       beneath the ink extents of the text being
                       underlined. This should be used only for underlining
@@ -380,7 +378,7 @@ of underlining.
 @PANGO_UNDERLINE_ERROR: a wavy underline should be drawn below.
                       This underline is typically used to indicate
                       an error such as a possilble mispelling; in some
-                      cases an contrasting color may automatically
+                      cases a contrasting color may automatically
                       be used. This type of underlining is available
                       since Pango 1.4.
 
@@ -416,11 +414,12 @@ The GObject type for #PangoUnderline.
 
 <!-- ##### USER_FUNCTION PangoAttrDataCopyFunc ##### -->
 <para>
-
+A copy function passed to attribute new functions that take
+user data.
 </para>
 
-@data: 
-@Returns: 
+@data: the user data
+@Returns: a new copy of @data.
 
 
 <!-- ##### FUNCTION pango_attr_scale_new ##### -->
@@ -510,7 +509,7 @@ The scale factor for three magnification steps (1.2 * 1.2 * 1.2).
 
 <!-- ##### STRUCT PangoColor ##### -->
 <para>
-The <structname>PangoColor</structname> structure is used to
+The #PangoColor structure is used to
 represent a color in an uncalibrated RGB colorspace.
 </para>
 
@@ -557,11 +556,11 @@ The GObject type for #PangoColor.
 
 <!-- ##### STRUCT PangoLanguage ##### -->
 <para>
-The <structname>PangoLanguage</structname> structure is used to
+The #PangoLanguage structure is used to
 represent a language.
 </para>
 <para>
-<structname>PangoLanguage</structname> pointers can be efficiently 
+#PangoLanguage pointers can be efficiently 
 copied and compared with each other.
 </para>
 
@@ -730,7 +729,7 @@ to filter out a subset of attributes for a list.
 <!-- ##### STRUCT PangoAttrIterator ##### -->
 <para>
 The #PangoAttrIterator structure is used to represent an
-iterator through a #PangoList. A new iterator is created
+iterator through a #PangoAttrList. A new iterator is created
 with pango_attr_list_get_iterator(). Once the iterator
 is created, it can be advanced through the style changes
 in the text using pango_attr_iterator_next(). At each
diff --git a/docs/tmpl/win32-fonts.sgml b/docs/tmpl/win32-fonts.sgml
index 50a9133f..d0aca19f 100644
--- a/docs/tmpl/win32-fonts.sgml
+++ b/docs/tmpl/win32-fonts.sgml
@@ -14,9 +14,6 @@ Functions for shape engines to manipulate Win32 fonts
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### MACRO PANGO_RENDER_TYPE_WIN32 ##### -->
 <para>
 A string constant identifying the Win32 renderer. The associated quark (see
@@ -145,8 +142,8 @@ g_quark_from_string()) is used to identify the renderer in pango_find_map().
 
 <!-- ##### STRUCT PangoWin32FontCache ##### -->
 <para>
-A <structname>PangoWin32FontCache</structname> caches
-<structname>HFONT</structname>s by their <structname>LOGFONT</structname> descriptions. 
+A #PangoWin32FontCache caches
+#HFONTs by their #LOGFONT descriptions. 
 </para>
 
 
diff --git a/docs/tmpl/x-fonts.sgml b/docs/tmpl/x-fonts.sgml
index ee19346b..875fa26b 100644
--- a/docs/tmpl/x-fonts.sgml
+++ b/docs/tmpl/x-fonts.sgml
@@ -17,9 +17,6 @@ unpredictable results. Use the <link linkend="pango-Xft-Fonts-and-Rendering">Xft
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### MACRO PANGO_RENDER_TYPE_X ##### -->
 <para>
 A string constant identifying the X renderer. The associated quark (see 
@@ -269,8 +266,8 @@ glyph index.
 
 <!-- ##### STRUCT PangoXFontCache ##### -->
 <para>
-A <structname>PangoXFontCache</structname> caches
-<structname>XFontStruct</structname>s for a single display by their XLFD name. 
+A #PangoXFontCache caches
+#XFontStructs for a single display by their XLFD name. 
 </para>
 
 
diff --git a/docs/tmpl/xft-fonts.sgml b/docs/tmpl/xft-fonts.sgml
index a572c94b..fc4d6cae 100644
--- a/docs/tmpl/xft-fonts.sgml
+++ b/docs/tmpl/xft-fonts.sgml
@@ -39,9 +39,6 @@ overring the #PangoXftRendererClass virtual functions
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
 <!-- ##### STRUCT PangoXftFont ##### -->
 <para>