diff --git a/docs/reference/gtk/tmpl/.gitignore b/docs/reference/gtk/tmpl/.gitignore
index 0c37085575..c21db50ca8 100644
--- a/docs/reference/gtk/tmpl/.gitignore
+++ b/docs/reference/gtk/tmpl/.gitignore
@@ -113,6 +113,7 @@ gtktextview.sgml
gtktoggleaction.sgml
gtktoggletoolbutton.sgml
gtktoolbar.sgml
+gtktoolbutton.sgml
gtktoolitem.sgml
gtktooltip.sgml
gtktreednd.sgml
diff --git a/docs/reference/gtk/tmpl/gtktoolbutton.sgml b/docs/reference/gtk/tmpl/gtktoolbutton.sgml
deleted file mode 100644
index 10d9e1d9fc..0000000000
--- a/docs/reference/gtk/tmpl/gtktoolbutton.sgml
+++ /dev/null
@@ -1,253 +0,0 @@
-
-GtkToolButton
-
-
-A GtkToolItem subclass that displays buttons
-
-
-
-#GtkToolButtons are #GtkToolItems containing buttons.
-
-
-
-Use gtk_tool_button_new() to create a new #GtkToolButton. Use
-gtk_tool_button_new_with_stock() to create a #GtkToolButton
-containing a stock item.
-
-
-
-The label of a #GtkToolButton is determined by the properties
-"label-widget", "label", and "stock-id". If "label-widget" is
-non-%NULL, then that widget is used as the label. Otherwise, if
-"label" is non-%NULL, that string is used as the label. Otherwise, if
-"stock-id" is non-%NULL, the label is determined by the stock
-item. Otherwise, the button does not have a label.
-
-
-
-The icon of a #GtkToolButton is determined by the properties
-"icon-widget" and "stock-id". If "icon-widget" is non-%NULL, then
-that widget is used as the icon. Otherwise, if "stock-id" is
-non-%NULL, the icon is determined by the stock item. Otherwise,
-the button does not have a icon.
-
-
-
-
-
-
-
-#GtkToolbar
-The toolbar widget
-
-
-
-#GtkMenuToolButton
-A subclass of #GtkToolButton that displays on
- the toolbar a button with an additional dropdown
- menu
-
-
-
-#GtkToggleToolButton
-A subclass of #GtkToolButton that displays toggle
- buttons on the toolbar
-
-
-
-#GtkRadioToolButton
-A subclass of #GtkToolButton that displays radio
- buttons on the toolbar
-
-
-
-#GtkSeparatorToolItem
-A subclass of #GtkToolItem that separates groups of
- items on a toolbar
-
-
-
-
-
-
-
-
-
-
-
-
-
-The #GtkToolButton struct contains only private. It should only be
-accessed with the function described below.
-
-
-
-
-
-
-
-
-@toolbutton: the object which received the signal.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@icon_widget:
-@label:
-@Returns:
-
-
-
-
-
-
-
-@stock_id:
-@Returns:
-
-
-
-
-
-
-
-@button:
-@label:
-
-
-
-
-
-
-
-@button:
-@Returns:
-
-
-
-
-
-
-
-@button:
-@use_underline:
-
-
-
-
-
-
-
-@button:
-@Returns:
-
-
-
-
-
-
-
-@button:
-@stock_id:
-
-
-
-
-
-
-
-@button:
-@Returns:
-
-
-
-
-
-
-
-@button:
-@icon_name:
-
-
-
-
-
-
-
-@button:
-@Returns:
-
-
-
-
-
-
-
-@button:
-@icon_widget:
-
-
-
-
-
-
-
-@button:
-@Returns:
-
-
-
-
-
-
-
-@button:
-@label_widget:
-
-
-
-
-
-
-
-@button:
-@Returns:
-
-
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index 5a3bc469e2..ddf321b09b 100644
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -37,6 +37,37 @@
#include
+
+/**
+ * SECTION:gtktoolbutton
+ * @Short_description: A GtkToolItem subclass that displays buttons
+ * @Title: GtkToolButton
+ * @See_also: #GtkToolbar, #GtkMenuToolButton, #GtkToggleToolButton,
+ * #GtkRadioToolButton, #GtkSeparatorToolItem
+ *
+ * #GtkToolButtons are #GtkToolItems containing buttons.
+ *
+ * Use gtk_tool_button_new() to create a new #GtkToolButton. Use
+ * gtk_tool_button_new_with_stock() to create a #GtkToolButton
+ * containing a stock item.
+ *
+ * The label of a #GtkToolButton is determined by the properties
+ * #GtkToolButton:label-widget, #GtkToolButton:label, and
+ * #GtkToolButton:stock-id. If #GtkToolButton:label-widget is
+ * non-%NULL, then that widget is used as the label. Otherwise, if
+ * #GtkToolButton:label is non-%NULL, that string is used as the label.
+ * Otherwise, if #GtkToolButton:stock-id is non-%NULL, the label is
+ * determined by the stock item. Otherwise, the button does not have a label.
+ *
+ * The icon of a #GtkToolButton is determined by the properties
+ * #GtkToolButton:icon-widget and #GtkToolButton:stock-id. If
+ * #GtkToolButton:icon-widget is non-%NULL, then
+ * that widget is used as the icon. Otherwise, if #GtkToolButton:stock-id is
+ * non-%NULL, the icon is determined by the stock item. Otherwise,
+ * the button does not have a icon.
+ */
+
+
#define MENU_ID "gtk-tool-button-menu-id"
enum {