diff --git a/docs/reference/gtk/tmpl/.gitignore b/docs/reference/gtk/tmpl/.gitignore
index b6d9f7a12e..a9378ad349 100644
--- a/docs/reference/gtk/tmpl/.gitignore
+++ b/docs/reference/gtk/tmpl/.gitignore
@@ -1,2 +1,3 @@
+gtkhbox.sgml
 gtkmessagedialog.sgml
 gtktesting.sgml
diff --git a/docs/reference/gtk/tmpl/gtkhbox.sgml b/docs/reference/gtk/tmpl/gtkhbox.sgml
deleted file mode 100644
index 8af4c505d6..0000000000
--- a/docs/reference/gtk/tmpl/gtkhbox.sgml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkHBox
-
-<!-- ##### SECTION Short_Description ##### -->
-A horizontal container box
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-GtkHBox is a container that organizes child widgets into a single row.
-</para>
-
-<para>
-Use the #GtkBox packing interface to determine the arrangement,
-spacing, width, and alignment of GtkHBox children.
-</para>
-
-<para>
-All children are allocated the same height.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-
-<varlistentry>
-<term>#GtkVBox</term>
-<listitem><para>a sister class that organizes widgets into a column.</para></listitem>
-</varlistentry>
-
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkHBox ##### -->
-
-
-
-<!-- ##### FUNCTION gtk_hbox_new ##### -->
-<para>
-Creates a new GtkHBox.
-</para>
-
-@homogeneous: %TRUE if all children are to be given equal space allotments.
-@spacing: the number of pixels to place by default between children.
-@Returns: a new GtkHBox.
-
-
diff --git a/gtk/gtkhbox.c b/gtk/gtkhbox.c
index b917c4019d..61855f35af 100644
--- a/gtk/gtkhbox.c
+++ b/gtk/gtkhbox.c
@@ -30,6 +30,22 @@
 #include "gtkorientable.h"
 #include "gtkalias.h"
 
+
+/**
+ * SECTION:gtkhbox
+ * @Short_description: A horizontal container box
+ * @Title: GtkHBox
+ * @See_also: #GtkVBox
+ *
+ * #GtkHBox is a container that organizes child widgets into a single row.
+ *
+ * Use the #GtkBox packing interface to determine the arrangement,
+ * spacing, width, and alignment of #GtkHBox children.
+ *
+ * All children are allocated the same height.
+ */
+
+
 G_DEFINE_TYPE (GtkHBox, gtk_hbox, GTK_TYPE_BOX)
 
 static void
@@ -46,6 +62,15 @@ gtk_hbox_init (GtkHBox *hbox)
   _gtk_box_set_old_defaults (GTK_BOX (hbox));
 }
 
+/**
+ * gtk_hbox_new:
+ * @homogeneous: %TRUE if all children are to be given equal space allotments.
+ * @spacing: the number of pixels to place by default between children.
+ *
+ * Creates a new #GtkHBox.
+ *
+ * Returns: a new #GtkHBox.
+ */
 GtkWidget *
 gtk_hbox_new (gboolean homogeneous,
 	      gint     spacing)