diff --git a/ChangeLog b/ChangeLog
index 99934dd164..dc2247bc66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-31  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkbutton.c
+	* gtk/gtkiconview.c: fixed gtk-doc comments.
+
 2005-03-30  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #170755:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 99934dd164..dc2247bc66 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-03-31  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkbutton.c
+	* gtk/gtkiconview.c: fixed gtk-doc comments.
+
 2005-03-30  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #170755:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 99934dd164..dc2247bc66 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-03-31  Sven Neumann  <sven@gimp.org>
+
+	* gtk/gtkbutton.c
+	* gtk/gtkiconview.c: fixed gtk-doc comments.
+
 2005-03-30  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #170755:
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index b59cc224e7..3bd80e2cf4 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -1773,6 +1773,8 @@ gtk_button_set_image (GtkButton *button,
  * This may have been explicitly set by gtk_button_set_image()
  * or constructed by gtk_button_new_from_stock().
  *
+ * Return value: a #GtkWidget or %NULL in case there is no image
+ *
  * Since: 2.6
  */
 GtkWidget *
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 99c9bb7159..a79bc6e059 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -3825,7 +3825,7 @@ gtk_icon_view_get_item_width (GtkIconView *icon_view)
 
 
 /**
- * gtk_icon_view_set_item_width:
+ * gtk_icon_view_set_spacing:
  * @icon_view: a #GtkIconView
  * @spacing: the spacing
  * 
@@ -3873,7 +3873,7 @@ gtk_icon_view_get_spacing (GtkIconView *icon_view)
 /**
  * gtk_icon_view_set_row_spacing:
  * @icon_view: a #GtkIconView
- * @spacing: the row spacing
+ * @row_spacing: the row spacing
  * 
  * Sets the ::row-spacing property which specifies the space 
  * which is inserted between the rows of the icon view.
@@ -3918,7 +3918,7 @@ gtk_icon_view_get_row_spacing (GtkIconView *icon_view)
 /**
  * gtk_icon_view_set_column_spacing:
  * @icon_view: a #GtkIconView
- * @spacing: the column spacing
+ * @column_spacing: the column spacing
  * 
  * Sets the ::column-spacing property which specifies the space 
  * which is inserted between the columns of the icon view.