Add docs.

 	* docs/tmpl/xft-fonts.sgml:
	* docs/tmpl/freetype-fonts.sgml: Add docs.

	* pango/pangoxft-fontmap.c (pango_xft_substitute_changed):
	* pango/pangoft2-fontmap.c
	(pango_ft2_font_map_set_default_substitute):
	Fix doc typos.

11 files changed, 74 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 8d3812b0..e59bd516 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-11-29  Matthias Clasen  <maclas@gmx.de>
+
+	* docs/tmpl/xft-fonts.sgml: 
+	* docs/tmpl/freetype-fonts.sgml: Add docs.
+
+	* pango/pangoxft-fontmap.c (pango_xft_substitute_changed): 
+	* pango/pangoft2-fontmap.c
+	(pango_ft2_font_map_set_default_substitute):
+	Fix doc typos.
+
 2002-11-28  Matthias Clasen  <maclas@gmx.de>
 
 	* pango/pangoxft-fontmap.c: 
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 8d3812b0..e59bd516 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,13 @@
+2002-11-29  Matthias Clasen  <maclas@gmx.de>
+
+	* docs/tmpl/xft-fonts.sgml: 
+	* docs/tmpl/freetype-fonts.sgml: Add docs.
+
+	* pango/pangoxft-fontmap.c (pango_xft_substitute_changed): 
+	* pango/pangoft2-fontmap.c
+	(pango_ft2_font_map_set_default_substitute):
+	Fix doc typos.
+
 2002-11-28  Matthias Clasen  <maclas@gmx.de>
 
 	* pango/pangoxft-fontmap.c: 
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 8d3812b0..e59bd516 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,13 @@
+2002-11-29  Matthias Clasen  <maclas@gmx.de>
+
+	* docs/tmpl/xft-fonts.sgml: 
+	* docs/tmpl/freetype-fonts.sgml: Add docs.
+
+	* pango/pangoxft-fontmap.c (pango_xft_substitute_changed): 
+	* pango/pangoft2-fontmap.c
+	(pango_ft2_font_map_set_default_substitute):
+	Fix doc typos.
+
 2002-11-28  Matthias Clasen  <maclas@gmx.de>
 
 	* pango/pangoxft-fontmap.c: 
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 8d3812b0..e59bd516 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,13 @@
+2002-11-29  Matthias Clasen  <maclas@gmx.de>
+
+	* docs/tmpl/xft-fonts.sgml: 
+	* docs/tmpl/freetype-fonts.sgml: Add docs.
+
+	* pango/pangoxft-fontmap.c (pango_xft_substitute_changed): 
+	* pango/pangoft2-fontmap.c
+	(pango_ft2_font_map_set_default_substitute):
+	Fix doc typos.
+
 2002-11-28  Matthias Clasen  <maclas@gmx.de>
 
 	* pango/pangoxft-fontmap.c: 
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 8d3812b0..e59bd516 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,13 @@
+2002-11-29  Matthias Clasen  <maclas@gmx.de>
+
+	* docs/tmpl/xft-fonts.sgml: 
+	* docs/tmpl/freetype-fonts.sgml: Add docs.
+
+	* pango/pangoxft-fontmap.c (pango_xft_substitute_changed): 
+	* pango/pangoft2-fontmap.c
+	(pango_ft2_font_map_set_default_substitute):
+	Fix doc typos.
+
 2002-11-28  Matthias Clasen  <maclas@gmx.de>
 
 	* pango/pangoxft-fontmap.c: 
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 8d3812b0..e59bd516 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,13 @@
+2002-11-29  Matthias Clasen  <maclas@gmx.de>
+
+	* docs/tmpl/xft-fonts.sgml: 
+	* docs/tmpl/freetype-fonts.sgml: Add docs.
+
+	* pango/pangoxft-fontmap.c (pango_xft_substitute_changed): 
+	* pango/pangoft2-fontmap.c
+	(pango_ft2_font_map_set_default_substitute):
+	Fix doc typos.
+
 2002-11-28  Matthias Clasen  <maclas@gmx.de>
 
 	* pango/pangoxft-fontmap.c: 
diff --git a/docs/tmpl/freetype-fonts.sgml b/docs/tmpl/freetype-fonts.sgml
index 99190b22..c68fc2f5 100644
--- a/docs/tmpl/freetype-fonts.sgml
+++ b/docs/tmpl/freetype-fonts.sgml
@@ -16,7 +16,7 @@ FreeType Fonts and Rendering
 
 <!-- ##### STRUCT PangoFT2FontMap ##### -->
 <para>
-
+The #PangoFT2FontMap is the #PangoFontMap implementation for FreeType fonts.
 </para>
 
 
@@ -57,11 +57,11 @@ g_quark_from_string()) is used to identify the renderer in pango_find_map().
 
 <!-- ##### USER_FUNCTION PangoFT2SubstituteFunc ##### -->
 <para>
-
+Function type for doing final config tweaking on prepared FcPatterns.
 </para>
 
-@pattern: 
-@data: 
+@pattern: the FcPattern to tweak.
+@data: user data.
 
 
 <!-- ##### FUNCTION pango_ft2_font_map_set_default_substitute ##### -->
diff --git a/docs/tmpl/xft-fonts.sgml b/docs/tmpl/xft-fonts.sgml
index a45debb4..552301a4 100644
--- a/docs/tmpl/xft-fonts.sgml
+++ b/docs/tmpl/xft-fonts.sgml
@@ -56,11 +56,11 @@ g_quark_from_string()) is used to identify the renderer in pango_find_map().
 
 <!-- ##### USER_FUNCTION PangoXftSubstituteFunc ##### -->
 <para>
-
+Function type for doing final config tweaking on prepared FcPatterns.
 </para>
 
-@pattern: 
-@data: 
+@pattern: the FcPattern to tweak.
+@data: user data.
 
 
 <!-- ##### FUNCTION pango_xft_substitute_changed ##### -->
diff --git a/pango/opentype/pango-ot-info.c b/pango/opentype/pango-ot-info.c
index f32f141d..2152e084 100644
--- a/pango/opentype/pango-ot-info.c
+++ b/pango/opentype/pango-ot-info.c
@@ -105,12 +105,14 @@ pango_ot_info_finalizer (void *object)
 }
 
 /**
- * pango_ot_info_new:
+ * pango_ot_info_get:
  * @face: a #FT_Face.
  * @returns: the #PangoOTInfo for @face. This object will
  *   have the same lifetime as FT_Face.
  * 
  * Returns the #PangoOTInfo structure for the given FreeType font.
+ *
+ * Since: 1.2
  **/
 PangoOTInfo *
 pango_ot_info_get (FT_Face face)
diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c
index c9c28aa1..5edb890b 100644
--- a/pango/pangoft2-fontmap.c
+++ b/pango/pangoft2-fontmap.c
@@ -119,7 +119,7 @@ static PangoFT2FontMap *pango_ft2_global_fontmap = NULL;
  * to cache information about available fonts, and holds
  * certain global parameters such as the resolution and
  * the default substitute function (see
- * pango_font_map_set_default_substitute()).
+ * pango_ft2_font_map_set_default_substitute()).
  * 
  * Return value: the newly created fontmap object. Unref
  * with g_object_unref() when you are finished with it.
@@ -160,7 +160,7 @@ pango_ft2_font_map_new (void)
 }
 
 /**
- * pango_ft2_fontmap_set_default_substitute:
+ * pango_ft2_font_map_set_default_substitute:
  * @fontmap: a #PangoFT2FontMap
  * @func: function to call to to do final config tweaking
  *        on #FcPattern objects.
diff --git a/pango/pangoxft-fontmap.c b/pango/pangoxft-fontmap.c
index f5a50fb3..9e3f0ca5 100644
--- a/pango/pangoxft-fontmap.c
+++ b/pango/pangoxft-fontmap.c
@@ -297,7 +297,8 @@ pango_xft_set_default_substitute (Display                *display,
 
 /**
  * pango_xft_substitute_changed:
- * @fontmap: a #PangoXftFontmap
+ * @display: an X Display
+ * @screen: the screen number of a screen within @display
  * 
  * Call this function any time the results of the
  * default substitution function set with