Updates.

        * docs/pango-sections.txt, docs/tmpl/fonts.sgml,
        docs/tmpl/modules.sgml: Updates.

        * pango/modules.c: Documentation fixes.

11 files changed, 75 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index c2ef0a33..658ff373 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-03  Matthias Clasen  <matthiasc@poet.de>
+
+	* docs/pango-sections.txt, docs/tmpl/fonts.sgml, 
+	docs/tmpl/modules.sgml: Updates.
+
+	* pango/modules.c: Documentation fixes.
+
 2001-12-04  Sven Neumann  <sven@gimp.org>
 
 	* pango/pangoft2-fontmap.c
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index c2ef0a33..658ff373 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,10 @@
+2001-12-03  Matthias Clasen  <matthiasc@poet.de>
+
+	* docs/pango-sections.txt, docs/tmpl/fonts.sgml, 
+	docs/tmpl/modules.sgml: Updates.
+
+	* pango/modules.c: Documentation fixes.
+
 2001-12-04  Sven Neumann  <sven@gimp.org>
 
 	* pango/pangoft2-fontmap.c
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index c2ef0a33..658ff373 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+2001-12-03  Matthias Clasen  <matthiasc@poet.de>
+
+	* docs/pango-sections.txt, docs/tmpl/fonts.sgml, 
+	docs/tmpl/modules.sgml: Updates.
+
+	* pango/modules.c: Documentation fixes.
+
 2001-12-04  Sven Neumann  <sven@gimp.org>
 
 	* pango/pangoft2-fontmap.c
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index c2ef0a33..658ff373 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,10 @@
+2001-12-03  Matthias Clasen  <matthiasc@poet.de>
+
+	* docs/pango-sections.txt, docs/tmpl/fonts.sgml, 
+	docs/tmpl/modules.sgml: Updates.
+
+	* pango/modules.c: Documentation fixes.
+
 2001-12-04  Sven Neumann  <sven@gimp.org>
 
 	* pango/pangoft2-fontmap.c
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index c2ef0a33..658ff373 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,10 @@
+2001-12-03  Matthias Clasen  <matthiasc@poet.de>
+
+	* docs/pango-sections.txt, docs/tmpl/fonts.sgml, 
+	docs/tmpl/modules.sgml: Updates.
+
+	* pango/modules.c: Documentation fixes.
+
 2001-12-04  Sven Neumann  <sven@gimp.org>
 
 	* pango/pangoft2-fontmap.c
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index c2ef0a33..658ff373 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+2001-12-03  Matthias Clasen  <matthiasc@poet.de>
+
+	* docs/pango-sections.txt, docs/tmpl/fonts.sgml, 
+	docs/tmpl/modules.sgml: Updates.
+
+	* pango/modules.c: Documentation fixes.
+
 2001-12-04  Sven Neumann  <sven@gimp.org>
 
 	* pango/pangoft2-fontmap.c
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index c2ef0a33..658ff373 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+2001-12-03  Matthias Clasen  <matthiasc@poet.de>
+
+	* docs/pango-sections.txt, docs/tmpl/fonts.sgml, 
+	docs/tmpl/modules.sgml: Updates.
+
+	* pango/modules.c: Documentation fixes.
+
 2001-12-04  Sven Neumann  <sven@gimp.org>
 
 	* pango/pangoft2-fontmap.c
diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index c74a7656..7c3c55aa 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -197,7 +197,6 @@ pango_fontset_get_font
 pango_fontset_get_metrics
 PangoFontsetSimple
 PANGO_TYPE_FONTSET_SIMPLE
-PangoFontsetSimpleClass
 pango_fontset_simple_new
 pango_fontset_simple_append
 pango_fontset_simple_size
@@ -222,6 +221,7 @@ PANGO_IS_FONTSET_CLASS
 PANGO_FONTSET_GET_CLASS
 PANGO_FONTSET_SIMPLE
 PANGO_IS_FONTSET_SIMPLE
+PangoFontsetSimpleClass
 
 <SUBSECTION Private>
 pango_font_metrics_new
diff --git a/docs/tmpl/fonts.sgml b/docs/tmpl/fonts.sgml
index 6a45a922..6d93f19a 100644
--- a/docs/tmpl/fonts.sgml
+++ b/docs/tmpl/fonts.sgml
@@ -386,7 +386,8 @@ The GObject type for #PangoFontMask.
 
 <!-- ##### STRUCT PangoFontMetrics ##### -->
 <para>
-
+A #PangoFontMetrics structure holds the overall metric information
+for a font (possibly restricted to a script). 
 </para>
 
 @ref_count: 
@@ -550,7 +551,9 @@ Returns %TRUE if @object is a #PangoFont.
 
 <!-- ##### STRUCT PangoFontFamily ##### -->
 <para>
-
+The #PangoFontFamily structure is used to represent a family of related 
+font faces. The faces in a family share a common design, but differ in 
+slant, weight, width and other aspects.
 </para>
 
 @parent_instance: 
@@ -599,7 +602,8 @@ Returns %TRUE if @object is a #PangoFontFamily.
 
 <!-- ##### STRUCT PangoFontFace ##### -->
 <para>
-
+The #PangoFontFace structure is used to represent a group of fonts with 
+the same family, slant, weight, width, but varying sizes.
 </para>
 
 @parent_instance: 
@@ -771,13 +775,17 @@ The GObject type for #PangoFontset.
 
 <!-- ##### STRUCT PangoFontsetClass ##### -->
 <para>
-
+The #PangoFontsetClass structure holds the virtual functions for
+a particular #PangoFontset implementation.
 </para>
 
 @parent_class: 
-@get_font: 
-@get_metrics: 
-@get_language: 
+@get_font: a function to get the font in the fontset that contains the 
+   best glyph for the given unicode character; see pango_fontset_get_font().
+@get_metrics: a function to get overall metric information for the fonts 
+   in the fontset; see pango_fontset_get_metrics().
+@get_language: a function to get the language of the fontset.
+
 
 <!-- ##### FUNCTION pango_fontset_get_font ##### -->
 <para>
@@ -810,13 +818,6 @@ The GObject type for #PangoFontsetSimple.
 </para>
 
 
-
-<!-- ##### STRUCT PangoFontsetSimpleClass ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### FUNCTION pango_fontset_simple_new ##### -->
 <para>
 
diff --git a/docs/tmpl/modules.sgml b/docs/tmpl/modules.sgml
index 872b7e1b..9233e333 100644
--- a/docs/tmpl/modules.sgml
+++ b/docs/tmpl/modules.sgml
@@ -16,7 +16,9 @@ modules
 
 <!-- ##### STRUCT PangoIncludedModule ##### -->
 <para>
-
+The #PangoIncludedModule structure for a statically linked module 
+contains the functions that would otherwise be loaded from a dynamically 
+loaded module.
 </para>
 
 @list: 
@@ -25,13 +27,16 @@ modules
 
 <!-- ##### STRUCT PangoMap ##### -->
 <para>
-
+A #PangoMap structure can be used to determine the engine to
+use for each character.
 </para>
 
 
 <!-- ##### STRUCT PangoMapEntry ##### -->
 <para>
-
+A #PangoMapEntry contains information about the engine that should be used 
+for the codepoint to which this entry belongs and also whether the engine 
+matches the language tag for this entry's map exactly or just approximately.
 </para>
 
 @info: 
diff --git a/pango/modules.c b/pango/modules.c
index feabb0c3..f874fead 100644
--- a/pango/modules.c
+++ b/pango/modules.c
@@ -520,9 +520,9 @@ build_map (PangoMapInfo *info)
  * @wc:  an ISO-10646 codepoint
  * 
  * Returns the entry in the map for a given codepoint. The entry
- * contains information about engine that should be used for
+ * contains information about the engine that should be used for
  * the codepoint and also whether the engine matches the language
- * tag for the map was created exactly or just approximately.
+ * tag for which the map was created exactly or just approximately.
  * 
  * Return value: the #PangoMapEntry for the codepoint. This value
  *   is owned by the #PangoMap and should not be freed.