summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--docs/pango_markup.sgml3
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e41e337..9bd304ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-24 Owen Taylor <otaylor@redhat.com>
+
+ * docs/pango_markup.sgml (linkend): Fix a stray newline
+ (#308887, Ryan Lortie)
+
2005-06-22 Owen Taylor <otaylor@redhat.com>
* modules/khmer/khmer-fc.c (khmer_engine_shape): Add back
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 0e41e337..9bd304ae 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+2005-06-24 Owen Taylor <otaylor@redhat.com>
+
+ * docs/pango_markup.sgml (linkend): Fix a stray newline
+ (#308887, Ryan Lortie)
+
2005-06-22 Owen Taylor <otaylor@redhat.com>
* modules/khmer/khmer-fc.c (khmer_engine_shape): Add back
diff --git a/docs/pango_markup.sgml b/docs/pango_markup.sgml
index 7bd81ac3..3b4c1a5c 100644
--- a/docs/pango_markup.sgml
+++ b/docs/pango_markup.sgml
@@ -127,8 +127,7 @@ One of 'single', 'double', 'low', 'none'
</para></listitem>
</varlistentry>
-<varlistentry><term>underline_col
-or</term>
+<varlistentry><term>underline_color</term>
<listitem><para>
The color of underlines; an RGB color specification such as '#00FF00'
or a color name such as 'red'