fix cross-references in here

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

	* docs/pango_markup.sgml: fix cross-references in here

9 files changed, 43 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 345d9dda..7ac9808d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-11  Havoc Pennington  <hp@pobox.com>
+
+	* docs/pango_markup.sgml: fix cross-references in here
+
 2002-01-11  Havoc Pennington  <hp@redhat.com>
 
 	* pango/pango-layout.c (pango_layout_set_attributes): allow
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 345d9dda..7ac9808d 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,7 @@
+2002-01-11  Havoc Pennington  <hp@pobox.com>
+
+	* docs/pango_markup.sgml: fix cross-references in here
+
 2002-01-11  Havoc Pennington  <hp@redhat.com>
 
 	* pango/pango-layout.c (pango_layout_set_attributes): allow
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 345d9dda..7ac9808d 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,7 @@
+2002-01-11  Havoc Pennington  <hp@pobox.com>
+
+	* docs/pango_markup.sgml: fix cross-references in here
+
 2002-01-11  Havoc Pennington  <hp@redhat.com>
 
 	* pango/pango-layout.c (pango_layout_set_attributes): allow
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 345d9dda..7ac9808d 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,7 @@
+2002-01-11  Havoc Pennington  <hp@pobox.com>
+
+	* docs/pango_markup.sgml: fix cross-references in here
+
 2002-01-11  Havoc Pennington  <hp@redhat.com>
 
 	* pango/pango-layout.c (pango_layout_set_attributes): allow
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 345d9dda..7ac9808d 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,7 @@
+2002-01-11  Havoc Pennington  <hp@pobox.com>
+
+	* docs/pango_markup.sgml: fix cross-references in here
+
 2002-01-11  Havoc Pennington  <hp@redhat.com>
 
 	* pango/pango-layout.c (pango_layout_set_attributes): allow
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 345d9dda..7ac9808d 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,7 @@
+2002-01-11  Havoc Pennington  <hp@pobox.com>
+
+	* docs/pango_markup.sgml: fix cross-references in here
+
 2002-01-11  Havoc Pennington  <hp@redhat.com>
 
 	* pango/pango-layout.c (pango_layout_set_attributes): allow
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 345d9dda..7ac9808d 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,7 @@
+2002-01-11  Havoc Pennington  <hp@pobox.com>
+
+	* docs/pango_markup.sgml: fix cross-references in here
+
 2002-01-11  Havoc Pennington  <hp@redhat.com>
 
 	* pango/pango-layout.c (pango_layout_set_attributes): allow
diff --git a/docs/pango_markup.sgml b/docs/pango_markup.sgml
index a0311e31..fc8c225b 100644
--- a/docs/pango_markup.sgml
+++ b/docs/pango_markup.sgml
@@ -17,11 +17,12 @@ markup language to encode text plus a <link linkend="PangoAttrList">PangoAttrLis
 Frequently, you want to display some text to the user with attributes
 applied to part of the text (for example, you might want bold or
 italicized words). With the base Pango interfaces, you could create a
-#PangoAttrList and apply it to the text; the problem is that you'd
-need to apply attributes to some numeric range of characters, for
-example "characters 12-17." This is broken from an
-internationalization standpoint; once the text is translated, the word
-you wanted to italicize could be in a different position.
+<link linkend="PangoAttrList">PangoAttrList</link> and apply it to the
+text; the problem is that you'd need to apply attributes to some
+numeric range of characters, for example "characters 12-17." This is
+broken from an internationalization standpoint; once the text is
+translated, the word you wanted to italicize could be in a different
+position.
 </para>
 
 <para>
@@ -29,7 +30,7 @@ The solution is to include the text attributes in the string to be
 translated. Pango provides this feature with a small markup language.
 You can parse a marked-up string into the string text plus a
 <link linkend="PangoAttrList">PangoAttrList</link> using the function 
-pango_parse_markup().
+<link linkend="pango-parse-markup">pango_parse_markup()</link>.
 </para>
 
 <para>
@@ -38,11 +39,11 @@ A simple example of a marked-up string might be:
 </para>
 
 <para>
-The root tag of a marked-up document is &lt;markup&gt;, but
-pango_parse_markup() allows you to omit this tag, so you will most
-likely never need to use it. The most general markup tag is
-&lt;span&gt;, then there are some convenience tags. &lt;span&gt; has
-the following attributes:
+The root tag of a marked-up document is &lt;markup&gt;, but <link
+linkend="pango-parse-markup">pango_parse_markup()</link> allows you to
+omit this tag, so you will most likely never need to use it. The most
+general markup tag is &lt;span&gt;, then there are some convenience
+tags. &lt;span&gt; has the following attributes:
 <variablelist><title>&lt;span&gt; attributes</title>
 
 <varlistentry><term>font_desc</term>
diff --git a/docs/tmpl/freetype-fonts.sgml b/docs/tmpl/freetype-fonts.sgml
index 335faca3..a3d86f0a 100644
--- a/docs/tmpl/freetype-fonts.sgml
+++ b/docs/tmpl/freetype-fonts.sgml
@@ -68,6 +68,9 @@ g_quark_from_string()) is used to identify the renderer in pango_find_map().
 @y: 
 
 
+<<<<<<< freetype-fonts.sgml
+
+
 <!-- ##### FUNCTION pango_ft2_get_unknown_glyph ##### -->
 <para>