Import upstream release 1.11.21.11.2upstream-experimental

1 files changed, 6 insertions, 5 deletions

diff --git a/doc/public/html/cairo-cairo-font-face-t.html b/doc/public/html/cairo-cairo-font-face-t.html
index 3a8d19e..75653a6 100644
--- a/doc/public/html/cairo-cairo-font-face-t.html
+++ b/doc/public/html/cairo-cairo-font-face-t.html
@@ -61,8 +61,8 @@ slant, and other characteristic but no size, transformation, or size.
 <p>
 Font faces are created using <em class="firstterm">font-backend</em>-specific
 constructors, typically of the form
-cairo_<span class="emphasis"><em>backend</em></span><code class="function">_font_face_create()</code>, or implicitly
-using the <em class="firstterm">toy</em> text API by way of 
+<code class="function">cairo_<span class="emphasis"><em>backend</em></span>_font_face_create()</code>,
+or implicitly using the <em class="firstterm">toy</em> text API by way of
 <a class="link" href="cairo-text.html#cairo-select-font-face" title="cairo_select_font_face ()"><code class="function">cairo_select_font_face()</code></a>.  The resulting face can be accessed using
 <a class="link" href="cairo-text.html#cairo-get-font-face" title="cairo_get_font_face ()"><code class="function">cairo_get_font_face()</code></a>.
 </p>
@@ -183,8 +183,8 @@ backends" within cairo.
 <p>
 The type of a font face is determined by the function used to
 create it, which will generally be of the form
-cairo_<span class="emphasis"><em>type</em></span><code class="function">_font_face_create()</code>. The font face type can be queried
-with <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-get-type" title="cairo_font_face_get_type ()"><code class="function">cairo_font_face_get_type()</code></a>
+<code class="function">cairo_<span class="emphasis"><em>type</em></span>_font_face_create()</code>.
+The font face type can be queried with <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-get-type" title="cairo_font_face_get_type ()"><code class="function">cairo_font_face_get_type()</code></a>
 </p>
 <p>
 The various <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t" title="cairo_font_face_t"><span class="type">cairo_font_face_t</span></a> functions can be used with a font face
@@ -200,7 +200,8 @@ The various <a class="link" href="cairo-cairo-scaled-font-t.html#cairo-scaled-fo
 fonts of any type, but some font backends also provide
 type-specific functions that must only be called with a scaled font
 of the appropriate type. These functions have names that begin with
-cairo_<span class="emphasis"><em>type</em></span><code class="function">_scaled_font()</code> such as <a class="link" href="cairo-FreeType-Fonts.html#cairo-ft-scaled-font-lock-face" title="cairo_ft_scaled_font_lock_face ()"><code class="function">cairo_ft_scaled_font_lock_face()</code></a>.
+<code class="function">cairo_<span class="emphasis"><em>type</em></span>_scaled_font()</code>
+such as <a class="link" href="cairo-FreeType-Fonts.html#cairo-ft-scaled-font-lock-face" title="cairo_ft_scaled_font_lock_face ()"><code class="function">cairo_ft_scaled_font_lock_face()</code></a>.
 </p>
 <p>
 The behavior of calling a type-specific function with a scaled font