fix up docs to be clearer about PANGO_SCALE, as suggested by Dennis

2002-01-13  Havoc Pennington  <hp@pobox.com>

	* pango/fonts.c: fix up docs to be clearer about PANGO_SCALE,
	as suggested by Dennis Bjorklund

8 files changed, 47 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 7ac9808d..b5faa6ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-13  Havoc Pennington  <hp@pobox.com>
+
+	* pango/fonts.c: fix up docs to be clearer about PANGO_SCALE, 
+	as suggested by Dennis Bjorklund
+
 2002-01-11  Havoc Pennington  <hp@pobox.com>
 
 	* docs/pango_markup.sgml: fix cross-references in here
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 7ac9808d..b5faa6ad 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,8 @@
+2002-01-13  Havoc Pennington  <hp@pobox.com>
+
+	* pango/fonts.c: fix up docs to be clearer about PANGO_SCALE, 
+	as suggested by Dennis Bjorklund
+
 2002-01-11  Havoc Pennington  <hp@pobox.com>
 
 	* docs/pango_markup.sgml: fix cross-references in here
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 7ac9808d..b5faa6ad 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+2002-01-13  Havoc Pennington  <hp@pobox.com>
+
+	* pango/fonts.c: fix up docs to be clearer about PANGO_SCALE, 
+	as suggested by Dennis Bjorklund
+
 2002-01-11  Havoc Pennington  <hp@pobox.com>
 
 	* docs/pango_markup.sgml: fix cross-references in here
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 7ac9808d..b5faa6ad 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,8 @@
+2002-01-13  Havoc Pennington  <hp@pobox.com>
+
+	* pango/fonts.c: fix up docs to be clearer about PANGO_SCALE, 
+	as suggested by Dennis Bjorklund
+
 2002-01-11  Havoc Pennington  <hp@pobox.com>
 
 	* docs/pango_markup.sgml: fix cross-references in here
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 7ac9808d..b5faa6ad 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+2002-01-13  Havoc Pennington  <hp@pobox.com>
+
+	* pango/fonts.c: fix up docs to be clearer about PANGO_SCALE, 
+	as suggested by Dennis Bjorklund
+
 2002-01-11  Havoc Pennington  <hp@pobox.com>
 
 	* docs/pango_markup.sgml: fix cross-references in here
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 7ac9808d..b5faa6ad 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+2002-01-13  Havoc Pennington  <hp@pobox.com>
+
+	* pango/fonts.c: fix up docs to be clearer about PANGO_SCALE, 
+	as suggested by Dennis Bjorklund
+
 2002-01-11  Havoc Pennington  <hp@pobox.com>
 
 	* docs/pango_markup.sgml: fix cross-references in here
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 7ac9808d..b5faa6ad 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+2002-01-13  Havoc Pennington  <hp@pobox.com>
+
+	* pango/fonts.c: fix up docs to be clearer about PANGO_SCALE, 
+	as suggested by Dennis Bjorklund
+
 2002-01-11  Havoc Pennington  <hp@pobox.com>
 
 	* docs/pango_markup.sgml: fix cross-references in here
diff --git a/pango/fonts.c b/pango/fonts.c
index 2f7c85aa..53cbb879 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -179,7 +179,7 @@ pango_font_description_get_family (const PangoFontDescription *desc)
  * Sets the style field of a #PangoFontDescription. The
  * #PangoStyle enumeration describes whether the font is slanted and
  * the manner in which it is slanted; it can be either
- * %PANGO_STYLE_NORMAL, %PANGO_STYLE_ITALIC, or %PANGO_STYLE_OBLIQUE.
+ * #PANGO_STYLE_NORMAL, #PANGO_STYLE_ITALIC, or #PANGO_STYLE_OBLIQUE.
  * Most fonts will either have a italic style or an oblique
  * style, but not both, and font matching in Pango will 
  * match italic specifications with oblique fonts and vice-versa
@@ -219,8 +219,8 @@ pango_font_description_get_style (const PangoFontDescription *desc)
  * @desc: a #PangoFontDescription
  * @variant: the variant type for the font description.
  * 
- * Sets the variant field of a font description. The %PangoVariant
- * can either by %PANGO_VARIANT_NORMAL or %PANGO_VARIANT_SMALL_CAPS.
+ * Sets the variant field of a font description. The #PangoVariant
+ * can either be %PANGO_VARIANT_NORMAL or %PANGO_VARIANT_SMALL_CAPS.
  **/
 void
 pango_font_description_set_variant (PangoFontDescription *desc,
@@ -331,7 +331,7 @@ pango_font_description_get_stretch (const PangoFontDescription *desc)
  * pango_font_description_set_size:
  * @desc: a #PangoFontDescription
  * @size: the size for the font description in pango units.
- *        (%PANGO_SCALE pango units equals one point)
+ *        There are #PANGO_SCALE Pango units in one device unit (pixel/point).
  * 
  * Sets the size field of a font description.
  **/
@@ -353,10 +353,10 @@ pango_font_description_set_size (PangoFontDescription *desc,
  * See pango_font_description_get_size().
  * 
  * Return value: the size field for the font description in pango
- *   units.  (%PANGO_SCALE pango units equals one point). Returns 0 if
- *   the stretch field has not previously been set.
- *   pango_font_description_get_set_fields() to find out if the field
- *   was explicitely set or not.
+ *   units.  (There are #PANGO_SCALE pango units in one device unit &mdash;
+ *   pixels or points.) Returns 0 if the stretch field has not
+ *   previously been set.  pango_font_description_get_set_fields() to
+ *   find out if the field was explicitely set or not.
  **/
 gint
 pango_font_description_get_size (const PangoFontDescription *desc)
@@ -1196,7 +1196,7 @@ pango_font_metrics_unref (PangoFontMetrics *metrics)
  * actual drawn ink. It is necessary to lay out the text to figure
  * where the ink will be.)
  * 
- * Return value: the ascent, in pango units. (1 point == %PANGO_SCALE pango units.)
+ * Return value: the ascent, in pango units. (1 point/pixel == #PANGO_SCALE pango units.)
  **/
 int
 pango_font_metrics_get_ascent (PangoFontMetrics *metrics)
@@ -1216,7 +1216,7 @@ pango_font_metrics_get_ascent (PangoFontMetrics *metrics)
  * actual drawn ink. It is necessary to lay out the text to figure
  * where the ink will be.)
  * 
- * Return value: the descent, in pango units. (1 point == %PANGO_SCALE pango units.)
+ * Return value: the descent, in pango units. (1 point/pixel == #PANGO_SCALE pango units.)
  **/
 int
 pango_font_metrics_get_descent (PangoFontMetrics *metrics)
@@ -1235,7 +1235,7 @@ pango_font_metrics_get_descent (PangoFontMetrics *metrics)
  * determining the initial size for a window. Actual characters in
  * text will be wider and narrower than this.
  * 
- * Return value: the character width, in pango units. (1 point == %PANGO_SCALE pango units.)
+ * Return value: the character width, in pango units. (1 point/pixel == #PANGO_SCALE pango units.)
  **/
 int
 pango_font_metrics_get_approximate_char_width (PangoFontMetrics *metrics)
@@ -1256,7 +1256,7 @@ pango_font_metrics_get_approximate_char_width (PangoFontMetrics *metrics)
  * is generally somewhat more accurate than the result of
  * pango_font_metrics_get_approximate_digit_width().
  * 
- * Return value: the digit width, in pango units. (1 point == %PANGO_SCALE pango units.)
+ * Return value: the digit width, in pango units. (1 point/pixel == #PANGO_SCALE pango units.)
  **/
 int
 pango_font_metrics_get_approximate_digit_width (PangoFontMetrics *metrics)