[cairo-commit] 2 commits - src/cairo-ft-font.c

[Kristian Høgsberg]

 src/cairo-ft-font.c |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

New commits:
diff-tree d70ade00fb67c6f77d23653481079996ec1e1292 (from parents)
Merge: 41d435418c414405035eb911239dc6580edabd6b c7ef4cb3f3b14543842bf538dcb216d1ea51d89f
Author: Kristian Høgsberg <krh at dinky.bitplanet.net>
Date:   Mon May 15 17:53:56 2006 -0400

    Merge branch 'master' of git://git.freedesktop.org/git/cairo

diff-tree 41d435418c414405035eb911239dc6580edabd6b (from f500cef19f049a4a0ed296172618db2f26794932)
Author: Kristian Høgsberg <krh at dinky.bitplanet.net>
Date:   Mon May 15 17:36:12 2006 -0400

    Documentation fixes (cairo_font_create -> cairo_scaled_font_create).

diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index eb6ccd1..d48cec7 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -2163,9 +2163,10 @@ cairo_ft_font_options_substitute (const 
  * 
  * Creates a new font face for the FreeType font backend based on a
  * fontconfig pattern. This font can then be used with
- * cairo_set_font_face() or cairo_font_create(). The #cairo_scaled_font_t
- * returned from cairo_font_create() is also for the FreeType backend
- * and can be used with functions such as cairo_ft_font_lock_face().
+ * cairo_set_font_face() or cairo_scaled_font_create(). The
+ * #cairo_scaled_font_t returned from cairo_scaled_font_create() is
+ * also for the FreeType backend and can be used with functions such
+ * as cairo_ft_font_lock_face().
  *
  * Font rendering options are representated both here and when you
  * call cairo_scaled_font_create(). Font options that have a representation
@@ -2216,11 +2217,12 @@ cairo_ft_font_face_create_for_pattern (F
  *   are useful. You should not pass any of the flags affecting
  *   the load target, such as %FT_LOAD_TARGET_LIGHT.
  * 
- * Creates a new font face for the FreeType font backend from a pre-opened
- * FreeType face. This font can then be used with
- * cairo_set_font_face() or cairo_font_create(). The #cairo_scaled_font_t
- * returned from cairo_font_create() is also for the FreeType backend
- * and can be used with functions such as cairo_ft_font_lock_face().
+ * Creates a new font face for the FreeType font backend from a
+ * pre-opened FreeType face. This font can then be used with
+ * cairo_set_font_face() or cairo_scaled_font_create(). The
+ * #cairo_scaled_font_t returned from cairo_scaled_font_create() is
+ * also for the FreeType backend and can be used with functions such
+ * as cairo_ft_font_lock_face().
  * 
  * Return value: a newly created #cairo_font_face_t. Free with
  *  cairo_font_face_destroy() when you are done using it.