diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 03f77089e1..3688b4c07f 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,5 +1,8 @@
 2008-11-29  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/tmpl/gtktooltips.sgml:
+	* gtk/tmpl/gtkoptionmenu.sgml:
+	* gtk/tmpl/gtkcombo.sgml:
 	* gtk/tmpl/gtkwindow.sgml:
 	* gtk/tmpl/gtkwidget.sgml:
 	* gtk/tmpl/gtktogglebutton.sgml:
diff --git a/docs/reference/gtk/tmpl/gtkcombo.sgml b/docs/reference/gtk/tmpl/gtkcombo.sgml
index 2f291fdc96..85e4d09eef 100644
--- a/docs/reference/gtk/tmpl/gtkcombo.sgml
+++ b/docs/reference/gtk/tmpl/gtkcombo.sgml
@@ -24,7 +24,7 @@ arrow (cursor) keys, though this behaviour can be turned off with
 gtk_combo_set_use_arrows().
 </para>
 <para>
-As of GTK+ 2.4, #GtkCombo has been deprecated in favor of #GtkComboBox.
+As of GTK+ 2.4, #GtkCombo has been deprecated in favor of #GtkComboBoxEntry.
 </para>
 
 <example id="gtkcombo-simple-example">
diff --git a/docs/reference/gtk/tmpl/gtktooltips.sgml b/docs/reference/gtk/tmpl/gtktooltips.sgml
index 2b32138556..41ce78e567 100644
--- a/docs/reference/gtk/tmpl/gtktooltips.sgml
+++ b/docs/reference/gtk/tmpl/gtktooltips.sgml
@@ -6,8 +6,8 @@ Add tips to your widgets
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-<link linkend="GtkToolTips"><type>GtkTooltips</type></link> has been deprecated in GTK+ 2.12, in favor of the new
-<link linkend="GtkToolTip"><type>GtkTooltip</type></link> API.
+#GtkTooltips has been deprecated in GTK+ 2.12, in favor of the new
+#GtkTooltip API.
 </para>
 <para>
 Tooltips are the messages that appear next to a widget when the mouse pointer is held over it for a short amount of time. They are especially helpful for adding more verbose descriptions of things such as buttons in a toolbar.