Remove duplicates.

        * docs/pango-sections.txt: Remove duplicates.

        * docs/tmpl/fonts.sgml: Document PANGO_TYPE_FONTSET
        and PANGO_TYPE_FONTSET_SIMPLE.

        * pango/pangoxft-font.c: Fix typos in some doc comments.

10 files changed, 78 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index d76cb9e5..b0b9cc8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-11-22  Matthias Clasen  <matthiasc@poet.de>
+
+	* docs/pango-sections.txt: Remove duplicates. 
+	
+	* docs/tmpl/fonts.sgml: Document PANGO_TYPE_FONTSET
+	and PANGO_TYPE_FONTSET_SIMPLE.
+
+	* pango/pangoxft-font.c: Fix typos in some doc comments.
+
 Thu Nov 22 14:23:07 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* Version 0.22
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index d76cb9e5..b0b9cc8b 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,12 @@
+2001-11-22  Matthias Clasen  <matthiasc@poet.de>
+
+	* docs/pango-sections.txt: Remove duplicates. 
+	
+	* docs/tmpl/fonts.sgml: Document PANGO_TYPE_FONTSET
+	and PANGO_TYPE_FONTSET_SIMPLE.
+
+	* pango/pangoxft-font.c: Fix typos in some doc comments.
+
 Thu Nov 22 14:23:07 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* Version 0.22
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index d76cb9e5..b0b9cc8b 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,12 @@
+2001-11-22  Matthias Clasen  <matthiasc@poet.de>
+
+	* docs/pango-sections.txt: Remove duplicates. 
+	
+	* docs/tmpl/fonts.sgml: Document PANGO_TYPE_FONTSET
+	and PANGO_TYPE_FONTSET_SIMPLE.
+
+	* pango/pangoxft-font.c: Fix typos in some doc comments.
+
 Thu Nov 22 14:23:07 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* Version 0.22
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index d76cb9e5..b0b9cc8b 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,12 @@
+2001-11-22  Matthias Clasen  <matthiasc@poet.de>
+
+	* docs/pango-sections.txt: Remove duplicates. 
+	
+	* docs/tmpl/fonts.sgml: Document PANGO_TYPE_FONTSET
+	and PANGO_TYPE_FONTSET_SIMPLE.
+
+	* pango/pangoxft-font.c: Fix typos in some doc comments.
+
 Thu Nov 22 14:23:07 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* Version 0.22
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index d76cb9e5..b0b9cc8b 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,12 @@
+2001-11-22  Matthias Clasen  <matthiasc@poet.de>
+
+	* docs/pango-sections.txt: Remove duplicates. 
+	
+	* docs/tmpl/fonts.sgml: Document PANGO_TYPE_FONTSET
+	and PANGO_TYPE_FONTSET_SIMPLE.
+
+	* pango/pangoxft-font.c: Fix typos in some doc comments.
+
 Thu Nov 22 14:23:07 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* Version 0.22
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index d76cb9e5..b0b9cc8b 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,12 @@
+2001-11-22  Matthias Clasen  <matthiasc@poet.de>
+
+	* docs/pango-sections.txt: Remove duplicates. 
+	
+	* docs/tmpl/fonts.sgml: Document PANGO_TYPE_FONTSET
+	and PANGO_TYPE_FONTSET_SIMPLE.
+
+	* pango/pangoxft-font.c: Fix typos in some doc comments.
+
 Thu Nov 22 14:23:07 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* Version 0.22
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index d76cb9e5..b0b9cc8b 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,12 @@
+2001-11-22  Matthias Clasen  <matthiasc@poet.de>
+
+	* docs/pango-sections.txt: Remove duplicates. 
+	
+	* docs/tmpl/fonts.sgml: Document PANGO_TYPE_FONTSET
+	and PANGO_TYPE_FONTSET_SIMPLE.
+
+	* pango/pangoxft-font.c: Fix typos in some doc comments.
+
 Thu Nov 22 14:23:07 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* Version 0.22
diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index 6e9ee549..c74a7656 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -191,15 +191,13 @@ pango_font_map_load_fontset
 pango_font_map_list_families
 <SUBSECTION>
 PangoFontset
+PANGO_TYPE_FONTSET
+PangoFontsetClass
 pango_fontset_get_font
 pango_fontset_get_metrics
-PangoFontsetClass
-PANGO_TYPE_FONTSET_SIMPLE
-PANGO_FONTSET_SIMPLE
-PANGO_IS_FONTSET_SIMPLE
 PangoFontsetSimple
+PANGO_TYPE_FONTSET_SIMPLE
 PangoFontsetSimpleClass
-pango_fontset_simple_get_type
 pango_fontset_simple_new
 pango_fontset_simple_append
 pango_fontset_simple_size
@@ -219,11 +217,9 @@ PANGO_FONT_FAMILY_CLASS
 PANGO_IS_FONT_FACE_CLASS
 PANGO_FONTSET
 PANGO_IS_FONTSET
-PANGO_TYPE_FONTSET
 PANGO_FONTSET_CLASS
 PANGO_IS_FONTSET_CLASS
 PANGO_FONTSET_GET_CLASS
-PANGO_TYPE_FONTSET_SIMPLE
 PANGO_FONTSET_SIMPLE
 PANGO_IS_FONTSET_SIMPLE
 
diff --git a/docs/tmpl/fonts.sgml b/docs/tmpl/fonts.sgml
index daabba27..7deabce9 100644
--- a/docs/tmpl/fonts.sgml
+++ b/docs/tmpl/fonts.sgml
@@ -793,7 +793,13 @@ Returns the type of a #PangoFontMap.
 
 <!-- ##### MACRO PANGO_TYPE_FONTSET_SIMPLE ##### -->
 <para>
+The GObject type for #PangoFontsetSimple.
+</para>
+
 
+<!-- ##### MACRO PANGO_TYPE_FONTSET ##### -->
+<para>
+The GObject type for #PangoFontset.
 </para>
 
 
diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c
index 0b09ba20..9a71487b 100644
--- a/pango/pangoxft-font.c
+++ b/pango/pangoxft-font.c
@@ -225,14 +225,14 @@ draw_box (Display      *display,
 
 /**
  * pango_xft_render:
- * @draw:    the XftDraw object.
+ * @draw:    the <type>XftDraw</type> object.
  * @color:   the color in which to draw the string
  * @font:    the font in which to draw the string
  * @glyphs:  the glyph string to draw
  * @x:       the x position of start of string (in pixels)
  * @y:       the y position of baseline (in pixels)
  *
- * Render a PangoGlyphString onto an XftDraw object wrapping an X drawable.
+ * Renders a #PangoGlyphString onto an <type>XftDraw</type> object wrapping an X drawable.
  */
 static void
 pango_xft_real_render (Display          *display,
@@ -326,14 +326,14 @@ pango_xft_real_render (Display          *display,
 
 /**
  * pango_xft_render:
- * @draw:    the XftDraw object.
+ * @draw:    the <type>XftDraw</type> object.
  * @color:   the color in which to draw the string
  * @font:    the font in which to draw the string
  * @glyphs:  the glyph string to draw
  * @x:       the x position of start of string (in pixels)
  * @y:       the y position of baseline (in pixels)
  *
- * Render a PangoGlyphString onto an XftDraw object wrapping an X drawable.
+ * Renders a #PangoGlyphString onto an <type>XftDraw</type> object wrapping an X drawable.
  */
 void
 pango_xft_render (XftDraw          *draw,
@@ -352,7 +352,7 @@ pango_xft_render (XftDraw          *draw,
 }
 
 /**
- * pango_xft_picture render:
+ * pango_xft_picture_render:
  * @draw:         an X display
  * @src_picture:  the source picture to draw the string with
  * @dest_picture: the destination picture to draw the strign onto
@@ -361,7 +361,7 @@ pango_xft_render (XftDraw          *draw,
  * @x:            the x position of start of string (in pixels)
  * @y:            the y position of baseline (in pixels)
  *
- * Render a PangoGlyphString onto an Xrender picture object.
+ * Renders a #PangoGlyphString onto an Xrender <type>Picture</type> object.
  */
 void
 pango_xft_picture_render (Display          *display,