diff --git a/ChangeLog b/ChangeLog
index e24c7fd5de..0f0ac4eb33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkeditable.h: Match parameter names to make gtk-doc happy.
+
+2008-12-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfontsel.c: Merge docs inline.
+
 2008-12-28  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkprintsettings.c:
diff --git a/gtk/gtkeditable.h b/gtk/gtkeditable.h
index 5dffd37aed..914d41cb2b 100644
--- a/gtk/gtkeditable.h
+++ b/gtk/gtkeditable.h
@@ -86,11 +86,11 @@ struct _GtkEditableClass
 
 GType    gtk_editable_get_type             (void) G_GNUC_CONST;
 void     gtk_editable_select_region        (GtkEditable *editable,
-					    gint         start,
-					    gint         end);
+					    gint         start_pos,
+					    gint         end_pos);
 gboolean gtk_editable_get_selection_bounds (GtkEditable *editable,
-					    gint        *start,
-					    gint        *end);
+					    gint        *start_pos,
+					    gint        *end_pos);
 void     gtk_editable_insert_text          (GtkEditable *editable,
 					    const gchar *new_text,
 					    gint         new_text_length,