diff --git a/docs/reference/gtk/tmpl/gtkbutton.sgml b/docs/reference/gtk/tmpl/gtkbutton.sgml
index c2e2650bb8..6d921057e6 100644
--- a/docs/reference/gtk/tmpl/gtkbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkbutton.sgml
@@ -158,6 +158,8 @@ Returns the current relief style of the given #GtkButton.
 </para>
 
 @button: 
+@use_stock: 
+<!-- # Unused Parameters # -->
 @value: 
 
 
@@ -176,6 +178,8 @@ Returns the current relief style of the given #GtkButton.
 </para>
 
 @button: 
+@use_underline: 
+<!-- # Unused Parameters # -->
 @value: 
 
 
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index aeca79681c..eefc24f15c 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -1148,7 +1148,7 @@ gtk_button_set_use_underline (GtkButton *button,
 
 /**
  * gtk_button_get_use_underline:
- * @label: a #GtkButton
+ * @button: a #GtkButton
  *
  * Returns whether an embedded underline in the button label indicates a
  * mnemonic. See gtk_button_set_use_underline ().
diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index b27df541a8..3f40d54d3b 100644
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -96,10 +96,10 @@ void                  gtk_button_set_label         (GtkButton   *button,
 						    const gchar *label);
 G_CONST_RETURN gchar *gtk_button_get_label         (GtkButton   *button);
 void                  gtk_button_set_use_underline (GtkButton   *button,
-						    gboolean     value);
+						    gboolean     use_underline);
 gboolean              gtk_button_get_use_underline (GtkButton   *button);
 void                  gtk_button_set_use_stock     (GtkButton   *button,
-						    gboolean     value);
+						    gboolean     use_stock);
 gboolean              gtk_button_get_use_stock     (GtkButton   *button);
 void                  _gtk_button_set_depressed    (GtkButton   *button,
 						    gboolean     depressed);
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index bebb9b49af..0a61e0bf12 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -2037,8 +2037,7 @@ gtk_drag_source_set_icon_pixbuf (GtkWidget   *widget,
 /**
  * gtk_drag_source_set_icon_stock:
  * @widget: a #GtkWidget
- * @stock: the ID of the stock icon to use
- * @size: size at which to render the stock icon
+ * @stock_id: the ID of the stock icon to use
  *
  * Sets the icon that will be used for drags from a particular source
  * to a stock icon. 
diff --git a/gtk/gtkgamma.c b/gtk/gtkgamma.c
index 4eb9f410c0..2eb3c4e795 100644
--- a/gtk/gtkgamma.c
+++ b/gtk/gtkgamma.c
@@ -360,7 +360,8 @@ static void
 gamma_ok_callback (GtkWidget *w, gpointer data)
 {
   GtkGammaCurve *c = data;
-  gchar *start, *end;
+  const gchar *start;
+  gchar *end;
   gfloat v;
 
   start = gtk_entry_get_text (GTK_ENTRY (c->gamma_text));