diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index a14f6acd27..b9fc185ab9 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,11 @@
+Sat Nov  2 12:46:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk-pixbuf/Makefile.am: Remove rules for generation
+	of version.xml, which was causing make to always
+	rebuild the HTML file, and didn't seem to be used.
+
+	* gtk/tmpl/gtkliststore.sgml: SGML fixes.
+
 Sat Nov  2 08:41:47 2002  Jonathan Blandford  <jrb@gnome.org>
 
 	* gtk/tmpl/gtktreestore.sgml: clean up the wording.
diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
index 0414ecbd3a..87db5013c3 100644
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -41,18 +41,11 @@ HTML_IMAGES =
 
 # Extra SGML files that are included by DOC_MAIN_SGML_FILE
 content_files =				\
-	version.xml			\
 	gdk-pixbuf-from-drawables.sgml	\
 	gdk-pixbuf-rendering.sgml	\
 	gdk-pixbuf.sgml			\
 	porting-from-imlib.sgml
 
-version.xml: FORCE
-	@date +'<!ENTITY builddate "%Y-%m-%d">' > version.xml
-	@echo "<!ENTITY srcversion \"@GTK_VERSION@\">" >> version.xml
-
-FORCE:
-
 # Other files to distribute
 extra_files =
 
diff --git a/docs/reference/gdk/tmpl/colors.sgml b/docs/reference/gdk/tmpl/colors.sgml
index bbaad54566..8743a8783e 100644
--- a/docs/reference/gdk/tmpl/colors.sgml
+++ b/docs/reference/gdk/tmpl/colors.sgml
@@ -125,8 +125,8 @@ The colormap structure contains the following public fields.
 @colormap: 
 @colors: 
 @ncolors: 
-@writeable:
-@best_match:
+@writeable: 
+@best_match: 
 @success: 
 @Returns: 
 
@@ -135,20 +135,20 @@ The colormap structure contains the following public fields.
 <para>
 </para>
 
-@colormap:
-@color:
-@writeable:
-@best_match:
-@Returns:
+@colormap: 
+@color: 
+@writeable: 
+@best_match: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gdk_colormap_free_colors ##### -->
 <para>
 </para>
 
-@colormap:
-@colors:
-@ncolors:
+@colormap: 
+@colors: 
+@ncolors: 
 
 
 <!-- ##### FUNCTION gdk_colormap_query_color ##### -->
@@ -184,7 +184,7 @@ The colormap structure contains the following public fields.
 
 @colormap: 
 @colors: 
-@ncolors:
+@ncolors: 
 
 
 <!-- ##### FUNCTION gdk_color_copy ##### -->
@@ -211,7 +211,7 @@ The colormap structure contains the following public fields.
 @planes: 
 @nplanes: 
 @pixels: 
-@npixels:
+@npixels: 
 @Returns: 
 
 
@@ -221,7 +221,7 @@ The colormap structure contains the following public fields.
 
 @colormap: 
 @pixels: 
-@npixels:
+@npixels: 
 @planes: 
 
 
@@ -229,7 +229,7 @@ The colormap structure contains the following public fields.
 <para>
 </para>
 
-@colormap:
+@colormap: 
 @color: 
 @Returns: 
 
@@ -276,19 +276,14 @@ The colormap structure contains the following public fields.
 
 @colora: 
 @colorb: 
-@Returns:
+@Returns: 
 
 
 <!-- ##### FUNCTION gdk_color_hash ##### -->
 <para>
 </para>
 
-@colora:
+@colora: 
 @Returns: 
 
 
-
-
-
-
-
diff --git a/docs/reference/gdk/tmpl/cursors.sgml b/docs/reference/gdk/tmpl/cursors.sgml
index 98e6e8ffa4..70f616198f 100644
--- a/docs/reference/gdk/tmpl/cursors.sgml
+++ b/docs/reference/gdk/tmpl/cursors.sgml
@@ -127,7 +127,7 @@ The standard cursors available.
 @bg: 
 @x: 
 @y: 
-@Returns:
+@Returns: 
 
 
 <!-- ##### FUNCTION gdk_cursor_new_for_display ##### -->
diff --git a/docs/reference/gdk/tmpl/dnd.sgml b/docs/reference/gdk/tmpl/dnd.sgml
index f652b77481..12b3f0c7ac 100644
--- a/docs/reference/gdk/tmpl/dnd.sgml
+++ b/docs/reference/gdk/tmpl/dnd.sgml
@@ -29,6 +29,7 @@ the GTK+ documentation for more information.
 @context: 
 @Returns: 
 
+
 <!-- ##### FUNCTION gdk_drag_abort ##### -->
 <para>
 </para>
@@ -115,7 +116,7 @@ the GTK+ documentation for more information.
 @suggested_action: 
 @possible_actions: 
 @time: 
-@Returns:
+@Returns: 
 
 
 <!-- ##### FUNCTION gdk_drop_finish ##### -->
diff --git a/docs/reference/gdk/tmpl/drawing.sgml b/docs/reference/gdk/tmpl/drawing.sgml
index 35ea028c4c..64a6680dac 100644
--- a/docs/reference/gdk/tmpl/drawing.sgml
+++ b/docs/reference/gdk/tmpl/drawing.sgml
@@ -177,7 +177,7 @@ or a #GdkWindow.
 <para>
 </para>
 
-@drawable:
+@drawable: 
 @gc: 
 @x1: 
 @y1: 
@@ -353,7 +353,7 @@ function.
 @gc: 
 @x: 
 @y: 
-@string:
+@string: 
 
 
 <!-- ##### FUNCTION gdk_draw_text ##### -->
@@ -365,7 +365,7 @@ function.
 @gc: 
 @x: 
 @y: 
-@text:
+@text: 
 @text_length: 
 
 
@@ -387,6 +387,8 @@ function.
 Draws a pixmap, or a part of a pixmap, onto another drawable.
 </para>
 
+
+
 <!-- ##### FUNCTION gdk_draw_drawable ##### -->
 <para>
 
diff --git a/docs/reference/gdk/tmpl/fonts.sgml b/docs/reference/gdk/tmpl/fonts.sgml
index 63fac5c858..03a21e8bd5 100644
--- a/docs/reference/gdk/tmpl/fonts.sgml
+++ b/docs/reference/gdk/tmpl/fonts.sgml
@@ -426,7 +426,7 @@ are currently:
 <para>
 </para>
 
-@font:
+@font: 
 @string: 
 @Returns: 
 
@@ -521,7 +521,7 @@ are currently:
 </para>
 
 @font: 
-@character:
+@character: 
 @Returns: 
 
 
diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index 35265757e2..4ca53acd74 100644
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -1065,6 +1065,24 @@ after other user handlers and the default handler.
 </para>
 
 
+<!-- ##### ARG GtkSettings:gtk-menu-bar-popout-delay ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkSettings:gtk-menu-popout-delay ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkSettings:gtk-menu-submenu-hysteresis ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### STRUCT GtkSettingsClass ##### -->
 <para>
 
@@ -1122,30 +1140,6 @@ and its unique identifying integer.
 @nparams: 
 @params: 
 
-<!-- ##### SIGNAL GtkStatusbar::text-popped ##### -->
-<para>
-Is emitted whenever a new message is popped off a statusbar's stack.
-</para>
-
-@statusbar: the object which received the signal.
-@context_id: the context id of the relevant message/statusbar.
-@text: the message that was just popped.
-
-<!-- ##### SIGNAL GtkStatusbar::text-pushed ##### -->
-<para>
-Is emitted whenever a new message gets pushed onto a statusbar's stack.
-</para>
-
-@statusbar: the object which received the signal.
-@context_id: the context id of the relevant message/statusbar.
-@text: the message that was pushed.
-
-<!-- ##### ARG GtkStatusbar:shadow-type ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### STRUCT GtkStatusbarMsg ##### -->
 <para>
 Holds the data for a statusbar message. <structfield>text</structfield> holds the actual text string. <structfield>context_id</structfield> is the context that this message is associated with, and <structfield>message_id</structfield> is this particular message's identifier. However, these fields should not be modified directly.
diff --git a/docs/reference/gtk/tmpl/gtkalignment.sgml b/docs/reference/gtk/tmpl/gtkalignment.sgml
index 24a6dbd750..8e8e196ada 100644
--- a/docs/reference/gtk/tmpl/gtkalignment.sgml
+++ b/docs/reference/gtk/tmpl/gtkalignment.sgml
@@ -77,12 +77,12 @@ unused space, from 0 to 1. The values are similar to @xscale.
 
 </para>
 
-<!-- ##### ARG GtkAlignment:yalign ##### -->
+<!-- ##### ARG GtkAlignment:xscale ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkAlignment:xscale ##### -->
+<!-- ##### ARG GtkAlignment:yalign ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkaspectframe.sgml b/docs/reference/gtk/tmpl/gtkaspectframe.sgml
index 4f01f1aed2..a68fe393f1 100644
--- a/docs/reference/gtk/tmpl/gtkaspectframe.sgml
+++ b/docs/reference/gtk/tmpl/gtkaspectframe.sgml
@@ -63,6 +63,16 @@ to 1.0 (right aligned)
     ratio is taken from the requistion of the child.
 
 
+<!-- ##### ARG GtkAspectFrame:obey-child ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAspectFrame:ratio ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkAspectFrame:xalign ##### -->
 <para>
 
@@ -73,13 +83,3 @@ to 1.0 (right aligned)
 
 </para>
 
-<!-- ##### ARG GtkAspectFrame:ratio ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAspectFrame:obey-child ##### -->
-<para>
-
-</para>
-
diff --git a/docs/reference/gtk/tmpl/gtkbbox.sgml b/docs/reference/gtk/tmpl/gtkbbox.sgml
index d48f2ae890..f3c44669fb 100644
--- a/docs/reference/gtk/tmpl/gtkbbox.sgml
+++ b/docs/reference/gtk/tmpl/gtkbbox.sgml
@@ -162,7 +162,7 @@ box.
 
 </para>
 
-<!-- ##### ARG GtkButtonBox:child-min-height ##### -->
+<!-- ##### ARG GtkButtonBox:child-internal-pad-x ##### -->
 <para>
 
 </para>
@@ -172,7 +172,7 @@ box.
 
 </para>
 
-<!-- ##### ARG GtkButtonBox:child-internal-pad-x ##### -->
+<!-- ##### ARG GtkButtonBox:child-min-height ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkbox.sgml b/docs/reference/gtk/tmpl/gtkbox.sgml
index 3ad6e766b1..d4faa8dbe1 100644
--- a/docs/reference/gtk/tmpl/gtkbox.sgml
+++ b/docs/reference/gtk/tmpl/gtkbox.sgml
@@ -373,12 +373,12 @@ field in #GtkBoxChild-struct.
 in #GtkBoxChild-struct.
 
 
-<!-- ##### ARG GtkBox:spacing ##### -->
+<!-- ##### ARG GtkBox:homogeneous ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkBox:homogeneous ##### -->
+<!-- ##### ARG GtkBox:spacing ##### -->
 <para>
 
 </para>
@@ -393,12 +393,12 @@ in #GtkBoxChild-struct.
 
 </para>
 
-<!-- ##### ARG GtkBox:padding ##### -->
+<!-- ##### ARG GtkBox:pack-type ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkBox:pack-type ##### -->
+<!-- ##### ARG GtkBox:padding ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkbutton.sgml b/docs/reference/gtk/tmpl/gtkbutton.sgml
index 3508632683..844ffd6a54 100644
--- a/docs/reference/gtk/tmpl/gtkbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkbutton.sgml
@@ -239,12 +239,22 @@ mouse cursor is.
 
 </para>
 
+<!-- ##### ARG GtkButton:use-stock ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkButton:use-underline ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkButton:use-stock ##### -->
+<!-- ##### ARG GtkButton:child-displacement-x ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButton:child-displacement-y ##### -->
 <para>
 
 </para>
@@ -259,13 +269,3 @@ mouse cursor is.
 
 </para>
 
-<!-- ##### ARG GtkButton:child-displacement-y ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:child-displacement-x ##### -->
-<para>
-
-</para>
-
diff --git a/docs/reference/gtk/tmpl/gtkcellrenderer.sgml b/docs/reference/gtk/tmpl/gtkcellrenderer.sgml
index 39fffa1d4d..ca6aa259b5 100644
--- a/docs/reference/gtk/tmpl/gtkcellrenderer.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrenderer.sgml
@@ -117,56 +117,6 @@ GtkCellRenderer
 @height: 
 
 
-<!-- ##### ARG GtkCellRenderer:mode ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:visible ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:xalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:yalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:xpad ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:ypad ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:width ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:height ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:is-expander ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:is-expanded ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkCellRenderer:cell-background ##### -->
 <para>
 
@@ -182,3 +132,53 @@ GtkCellRenderer
 
 </para>
 
+<!-- ##### ARG GtkCellRenderer:height ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRenderer:is-expanded ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRenderer:is-expander ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRenderer:mode ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRenderer:visible ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRenderer:width ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRenderer:xalign ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRenderer:xpad ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRenderer:yalign ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRenderer:ypad ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml b/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml
index 8d2e1c5509..9edecfad3c 100644
--- a/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml
@@ -33,12 +33,17 @@ GtkCellRendererPixbuf
 
 </para>
 
+<!-- ##### ARG GtkCellRendererPixbuf:pixbuf-expander-closed ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkCellRendererPixbuf:pixbuf-expander-open ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkCellRendererPixbuf:pixbuf-expander-closed ##### -->
+<!-- ##### ARG GtkCellRendererPixbuf:stock-detail ##### -->
 <para>
 
 </para>
@@ -53,8 +58,3 @@ GtkCellRendererPixbuf
 
 </para>
 
-<!-- ##### ARG GtkCellRendererPixbuf:stock-detail ##### -->
-<para>
-
-</para>
-
diff --git a/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml b/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml
index 8a96388ec7..c0b05209c1 100644
--- a/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml
@@ -46,16 +46,6 @@ GtkCellRendererText
 @arg1: 
 @arg2: 
 
-<!-- ##### ARG GtkCellRendererText:text ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:markup ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkCellRendererText:attributes ##### -->
 <para>
 
@@ -66,17 +56,32 @@ GtkCellRendererText
 
 </para>
 
-<!-- ##### ARG GtkCellRendererText:foreground ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkCellRendererText:background-gdk ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkCellRendererText:foreground-gdk ##### -->
+<!-- ##### ARG GtkCellRendererText:background-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRendererText:editable ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRendererText:editable-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRendererText:family ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRendererText:family-set ##### -->
 <para>
 
 </para>
@@ -91,27 +96,42 @@ GtkCellRendererText
 
 </para>
 
-<!-- ##### ARG GtkCellRendererText:family ##### -->
+<!-- ##### ARG GtkCellRendererText:foreground ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkCellRendererText:style ##### -->
+<!-- ##### ARG GtkCellRendererText:foreground-gdk ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkCellRendererText:variant ##### -->
+<!-- ##### ARG GtkCellRendererText:foreground-set ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkCellRendererText:weight ##### -->
+<!-- ##### ARG GtkCellRendererText:markup ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkCellRendererText:stretch ##### -->
+<!-- ##### ARG GtkCellRendererText:rise ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRendererText:rise-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRendererText:scale ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRendererText:scale-set ##### -->
 <para>
 
 </para>
@@ -126,57 +146,12 @@ GtkCellRendererText
 
 </para>
 
-<!-- ##### ARG GtkCellRendererText:scale ##### -->
+<!-- ##### ARG GtkCellRendererText:size-set ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkCellRendererText:editable ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:strikethrough ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:underline ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:rise ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:background-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:foreground-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:family-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:style-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:variant-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:weight-set ##### -->
+<!-- ##### ARG GtkCellRendererText:stretch ##### -->
 <para>
 
 </para>
@@ -186,17 +161,7 @@ GtkCellRendererText
 
 </para>
 
-<!-- ##### ARG GtkCellRendererText:size-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:scale-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:editable-set ##### -->
+<!-- ##### ARG GtkCellRendererText:strikethrough ##### -->
 <para>
 
 </para>
@@ -206,12 +171,47 @@ GtkCellRendererText
 
 </para>
 
+<!-- ##### ARG GtkCellRendererText:style ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRendererText:style-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRendererText:text ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRendererText:underline ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkCellRendererText:underline-set ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkCellRendererText:rise-set ##### -->
+<!-- ##### ARG GtkCellRendererText:variant ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRendererText:variant-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRendererText:weight ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRendererText:weight-set ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkclist.sgml b/docs/reference/gtk/tmpl/gtkclist.sgml
index 8d80576b8b..8b03ce965f 100644
--- a/docs/reference/gtk/tmpl/gtkclist.sgml
+++ b/docs/reference/gtk/tmpl/gtkclist.sgml
@@ -1264,9 +1264,15 @@ previously selected row in a "single" or "browse" mode CList.
 An integer value for a column.
 </para>
 
-<!-- ##### ARG GtkCList:shadow-type ##### -->
+<!-- ##### ARG GtkCList:reorderable ##### -->
 <para>
-Sets the shadowing for the CList.
+A boolean value for determining if the user can re-order the CList's
+columns.
+</para>
+
+<!-- ##### ARG GtkCList:row-height ##### -->
+<para>
+An integer value representing the height of a row in pixels.
 </para>
 
 <!-- ##### ARG GtkCList:selection-mode ##### -->
@@ -1274,9 +1280,14 @@ Sets the shadowing for the CList.
 Sets the type of selection mode for the CList.
 </para>
 
-<!-- ##### ARG GtkCList:row-height ##### -->
+<!-- ##### ARG GtkCList:shadow-type ##### -->
 <para>
-An integer value representing the height of a row in pixels.
+Sets the shadowing for the CList.
+</para>
+
+<!-- ##### ARG GtkCList:sort-type ##### -->
+<para>
+
 </para>
 
 <!-- ##### ARG GtkCList:titles-active ##### -->
@@ -1285,20 +1296,9 @@ A boolean value for setting whether the column titles can be
 clicked.
 </para>
 
-<!-- ##### ARG GtkCList:reorderable ##### -->
-<para>
-A boolean value for determining if the user can re-order the CList's
-columns.
-</para>
-
 <!-- ##### ARG GtkCList:use-drag-icons ##### -->
 <para>
 A boolean value for setting whether to use icons during drag
 operations.
 </para>
 
-<!-- ##### ARG GtkCList:sort-type ##### -->
-<para>
-
-</para>
-
diff --git a/docs/reference/gtk/tmpl/gtkcolorsel.sgml b/docs/reference/gtk/tmpl/gtkcolorsel.sgml
index 3981b26262..80eec4bb14 100644
--- a/docs/reference/gtk/tmpl/gtkcolorsel.sgml
+++ b/docs/reference/gtk/tmpl/gtkcolorsel.sgml
@@ -265,12 +265,7 @@ according to its update policy.
 
 @colorselection: the object which received the signal.
 
-<!-- ##### ARG GtkColorSelection:has-palette ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkColorSelection:has-opacity-control ##### -->
+<!-- ##### ARG GtkColorSelection:current-alpha ##### -->
 <para>
 
 </para>
@@ -280,7 +275,12 @@ according to its update policy.
 
 </para>
 
-<!-- ##### ARG GtkColorSelection:current-alpha ##### -->
+<!-- ##### ARG GtkColorSelection:has-opacity-control ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkColorSelection:has-palette ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkcombo.sgml b/docs/reference/gtk/tmpl/gtkcombo.sgml
index e503adbcab..3662d43f25 100644
--- a/docs/reference/gtk/tmpl/gtkcombo.sgml
+++ b/docs/reference/gtk/tmpl/gtkcombo.sgml
@@ -204,6 +204,16 @@ instead.
 @combo: a #GtkCombo.
 
 
+<!-- ##### ARG GtkCombo:allow-empty ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCombo:case-sensitive ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkCombo:enable-arrow-keys ##### -->
 <para>
 
@@ -214,16 +224,6 @@ instead.
 
 </para>
 
-<!-- ##### ARG GtkCombo:case-sensitive ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCombo:allow-empty ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkCombo:value-in-list ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkcontainer.sgml b/docs/reference/gtk/tmpl/gtkcontainer.sgml
index ec7ee41ed1..76c478992b 100644
--- a/docs/reference/gtk/tmpl/gtkcontainer.sgml
+++ b/docs/reference/gtk/tmpl/gtkcontainer.sgml
@@ -417,13 +417,13 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-<!-- ##### ARG GtkContainer:resize-mode ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkContainer:child ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG GtkContainer:resize-mode ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkctree.sgml b/docs/reference/gtk/tmpl/gtkctree.sgml
index bfa5ba39e4..996dcda933 100644
--- a/docs/reference/gtk/tmpl/gtkctree.sgml
+++ b/docs/reference/gtk/tmpl/gtkctree.sgml
@@ -1216,14 +1216,9 @@ Emitted when a node is unselected.
 @node: The node  corresponding to the selected row.
 @column: 
 
-<!-- ##### ARG GtkCTree:n-columns ##### -->
+<!-- ##### ARG GtkCTree:expander-style ##### -->
 <para>
-The number of columns in the tree.
-</para>
-
-<!-- ##### ARG GtkCTree:tree-column ##### -->
-<para>
-The column in which the actual tree graphic appears.
+The style of the expander buttons.
 </para>
 
 <!-- ##### ARG GtkCTree:indent ##### -->
@@ -1231,9 +1226,14 @@ The column in which the actual tree graphic appears.
 The number of pixels to indent the tree levels.
 </para>
 
-<!-- ##### ARG GtkCTree:spacing ##### -->
+<!-- ##### ARG GtkCTree:line-style ##### -->
 <para>
-The number of pixels between the tree and the columns.
+The style of the lines in the tree graphic.
+</para>
+
+<!-- ##### ARG GtkCTree:n-columns ##### -->
+<para>
+The number of columns in the tree.
 </para>
 
 <!-- ##### ARG GtkCTree:show-stub ##### -->
@@ -1241,13 +1241,13 @@ The number of pixels between the tree and the columns.
 FIXME
 </para>
 
-<!-- ##### ARG GtkCTree:line-style ##### -->
+<!-- ##### ARG GtkCTree:spacing ##### -->
 <para>
-The style of the lines in the tree graphic.
+The number of pixels between the tree and the columns.
 </para>
 
-<!-- ##### ARG GtkCTree:expander-style ##### -->
+<!-- ##### ARG GtkCTree:tree-column ##### -->
 <para>
-The style of the expander buttons.
+The column in which the actual tree graphic appears.
 </para>
 
diff --git a/docs/reference/gtk/tmpl/gtkcurve.sgml b/docs/reference/gtk/tmpl/gtkcurve.sgml
index 90602ed947..e2aa3d701f 100644
--- a/docs/reference/gtk/tmpl/gtkcurve.sgml
+++ b/docs/reference/gtk/tmpl/gtkcurve.sgml
@@ -137,23 +137,23 @@ calling gtk_curve_reset() or gtk_curve_set_gamma().
 
 </para>
 
-<!-- ##### ARG GtkCurve:min-x ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkCurve:max-x ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkCurve:min-y ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkCurve:max-y ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG GtkCurve:min-x ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCurve:min-y ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkentry.sgml b/docs/reference/gtk/tmpl/gtkentry.sgml
index 5b04ab5b3f..75abf29406 100644
--- a/docs/reference/gtk/tmpl/gtkentry.sgml
+++ b/docs/reference/gtk/tmpl/gtkentry.sgml
@@ -335,31 +335,21 @@ use gtk_editable_set_editable() instead.
 
 @entry: the object which received the signal.
 
+<!-- ##### ARG GtkEntry:activates-default ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkEntry:cursor-position ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkEntry:selection-bound ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkEntry:editable ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkEntry:max-length ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntry:visibility ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkEntry:has-frame ##### -->
 <para>
 
@@ -370,12 +360,7 @@ use gtk_editable_set_editable() instead.
 
 </para>
 
-<!-- ##### ARG GtkEntry:activates-default ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkEntry:width-chars ##### -->
+<!-- ##### ARG GtkEntry:max-length ##### -->
 <para>
 
 </para>
@@ -385,8 +370,23 @@ use gtk_editable_set_editable() instead.
 
 </para>
 
+<!-- ##### ARG GtkEntry:selection-bound ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkEntry:text ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG GtkEntry:visibility ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkEntry:width-chars ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkfontsel.sgml b/docs/reference/gtk/tmpl/gtkfontsel.sgml
index d3c030f016..ab9854e620 100644
--- a/docs/reference/gtk/tmpl/gtkfontsel.sgml
+++ b/docs/reference/gtk/tmpl/gtkfontsel.sgml
@@ -107,12 +107,12 @@ Sets the text displayed in the preview area.
 @text: the text to display in the preview area.
 
 
-<!-- ##### ARG GtkFontSelection:font-name ##### -->
+<!-- ##### ARG GtkFontSelection:font ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkFontSelection:font ##### -->
+<!-- ##### ARG GtkFontSelection:font-name ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkframe.sgml b/docs/reference/gtk/tmpl/gtkframe.sgml
index 9350ed478a..b1ea262cd0 100644
--- a/docs/reference/gtk/tmpl/gtkframe.sgml
+++ b/docs/reference/gtk/tmpl/gtkframe.sgml
@@ -120,6 +120,11 @@ Set the shadow type for the Frame widget.
 
 </para>
 
+<!-- ##### ARG GtkFrame:label-widget ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkFrame:label-xalign ##### -->
 <para>
 
@@ -140,8 +145,3 @@ Set the shadow type for the Frame widget.
 
 </para>
 
-<!-- ##### ARG GtkFrame:label-widget ##### -->
-<para>
-
-</para>
-
diff --git a/docs/reference/gtk/tmpl/gtkhandlebox.sgml b/docs/reference/gtk/tmpl/gtkhandlebox.sgml
index 95b81034b7..ea47a6365c 100644
--- a/docs/reference/gtk/tmpl/gtkhandlebox.sgml
+++ b/docs/reference/gtk/tmpl/gtkhandlebox.sgml
@@ -177,6 +177,11 @@ handlebox are detached from the main window.
          (this argument provides no extra information
           and is here only for backwards-compatibility)
 
+<!-- ##### ARG GtkHandleBox:handle-position ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkHandleBox:shadow ##### -->
 <para>
 
@@ -187,11 +192,6 @@ handlebox are detached from the main window.
 
 </para>
 
-<!-- ##### ARG GtkHandleBox:handle-position ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkHandleBox:snap-edge ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkimage.sgml b/docs/reference/gtk/tmpl/gtkimage.sgml
index af6327c4fa..f406e97603 100644
--- a/docs/reference/gtk/tmpl/gtkimage.sgml
+++ b/docs/reference/gtk/tmpl/gtkimage.sgml
@@ -359,36 +359,11 @@ Gets the #GtkImage.
 @mask: a #GdkBitmap that indicates which parts of the image should be transparent.
 
 
-<!-- ##### ARG GtkImage:pixbuf ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:pixmap ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:image ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:mask ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkImage:file ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkImage:stock ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkImage:icon-set ##### -->
 <para>
 
@@ -399,11 +374,36 @@ Gets the #GtkImage.
 
 </para>
 
+<!-- ##### ARG GtkImage:image ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkImage:mask ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkImage:pixbuf ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkImage:pixbuf-animation ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG GtkImage:pixmap ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkImage:stock ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkImage:storage-type ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtklabel.sgml b/docs/reference/gtk/tmpl/gtklabel.sgml
index 7e3c795584..638268e18f 100644
--- a/docs/reference/gtk/tmpl/gtklabel.sgml
+++ b/docs/reference/gtk/tmpl/gtklabel.sgml
@@ -471,22 +471,12 @@ Gtk+ 1.0.x.
 @label: the object which received the signal.
 @arg1: 
 
-<!-- ##### ARG GtkLabel:label ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkLabel:attributes ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkLabel:use-markup ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLabel:use-underline ##### -->
+<!-- ##### ARG GtkLabel:cursor-position ##### -->
 <para>
 
 </para>
@@ -496,17 +486,7 @@ Gtk+ 1.0.x.
 
 </para>
 
-<!-- ##### ARG GtkLabel:pattern ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLabel:wrap ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLabel:selectable ##### -->
+<!-- ##### ARG GtkLabel:label ##### -->
 <para>
 
 </para>
@@ -521,7 +501,12 @@ Gtk+ 1.0.x.
 
 </para>
 
-<!-- ##### ARG GtkLabel:cursor-position ##### -->
+<!-- ##### ARG GtkLabel:pattern ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLabel:selectable ##### -->
 <para>
 
 </para>
@@ -531,3 +516,18 @@ Gtk+ 1.0.x.
 
 </para>
 
+<!-- ##### ARG GtkLabel:use-markup ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLabel:use-underline ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLabel:wrap ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtklayout.sgml b/docs/reference/gtk/tmpl/gtklayout.sgml
index 599a4ae52f..24c2107310 100644
--- a/docs/reference/gtk/tmpl/gtklayout.sgml
+++ b/docs/reference/gtk/tmpl/gtklayout.sgml
@@ -156,6 +156,11 @@ area.
 
 </para>
 
+<!-- ##### ARG GtkLayout:height ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkLayout:vadjustment ##### -->
 <para>
 
@@ -166,11 +171,6 @@ area.
 
 </para>
 
-<!-- ##### ARG GtkLayout:height ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkLayout:x ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkliststore.sgml b/docs/reference/gtk/tmpl/gtkliststore.sgml
index 819fccbe0c..6bfac2fceb 100644
--- a/docs/reference/gtk/tmpl/gtkliststore.sgml
+++ b/docs/reference/gtk/tmpl/gtkliststore.sgml
@@ -35,15 +35,15 @@ enum {
                                    G_TYPE_INT,
                                    G_TYPE_BOOLEAN);
 
-  for (i = 0; i < 10; i++)
+  for (i = 0; i &lt; 10; i++)
     {
       gchar *some_data;
 
       some_data = get_some_data (i);
 
       /* Add a new row to the model */
-      gtk_list_store_append (list_store, &iter);
-      gtk_list_store_set (list_store, &iter,
+      gtk_list_store_append (list_store, &amp;iter);
+      gtk_list_store_set (list_store, &amp;iter,
                           COLUMN_STRING, some_data,
                           COLUMN_INT, i,
                           COLUMN_BOOLEAN,  FALSE,
@@ -55,10 +55,10 @@ enum {
   /* Modify a particular row */
   path = gtk_tree_path_new_from_string ("4");
   gtk_tree_model_get_iter (GTK_TREE_MODEL (list_store),
-                           &iter,
+                           &amp;iter,
                            path);
   gtk_tree_path_free (path);
-  gtk_list_store_set (list_store, &iter,
+  gtk_list_store_set (list_store, &amp;iter,
                       COLUMN_BOOLEAN, TRUE,
                       -1);
 }
diff --git a/docs/reference/gtk/tmpl/gtkmessagedialog.sgml b/docs/reference/gtk/tmpl/gtkmessagedialog.sgml
index 73b5706052..7908571eea 100644
--- a/docs/reference/gtk/tmpl/gtkmessagedialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkmessagedialog.sgml
@@ -102,12 +102,12 @@ then call gtk_dialog_add_buttons().
 @Returns: 
 
 
-<!-- ##### ARG GtkMessageDialog:message-type ##### -->
+<!-- ##### ARG GtkMessageDialog:buttons ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkMessageDialog:buttons ##### -->
+<!-- ##### ARG GtkMessageDialog:message-type ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkmisc.sgml b/docs/reference/gtk/tmpl/gtkmisc.sgml
index 1354d28ab3..2658825465 100644
--- a/docs/reference/gtk/tmpl/gtkmisc.sgml
+++ b/docs/reference/gtk/tmpl/gtkmisc.sgml
@@ -107,12 +107,12 @@ in pixels.
 
 </para>
 
-<!-- ##### ARG GtkMisc:yalign ##### -->
+<!-- ##### ARG GtkMisc:xpad ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkMisc:xpad ##### -->
+<!-- ##### ARG GtkMisc:yalign ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml
index 6694ba7be5..715cfd908b 100644
--- a/docs/reference/gtk/tmpl/gtknotebook.sgml
+++ b/docs/reference/gtk/tmpl/gtknotebook.sgml
@@ -454,12 +454,22 @@ Emitted when the user or a function changes the current page.
 @page: the new current page
 @page_num: the index of the page
 
-<!-- ##### ARG GtkNotebook:tab-pos ##### -->
+<!-- ##### ARG GtkNotebook:enable-popup ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkNotebook:show-tabs ##### -->
+<!-- ##### ARG GtkNotebook:homogeneous ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:page ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:scrollable ##### -->
 <para>
 
 </para>
@@ -469,7 +479,7 @@ Emitted when the user or a function changes the current page.
 
 </para>
 
-<!-- ##### ARG GtkNotebook:scrollable ##### -->
+<!-- ##### ARG GtkNotebook:show-tabs ##### -->
 <para>
 
 </para>
@@ -484,31 +494,16 @@ Emitted when the user or a function changes the current page.
 
 </para>
 
+<!-- ##### ARG GtkNotebook:tab-pos ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkNotebook:tab-vborder ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkNotebook:page ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:enable-popup ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:homogeneous ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:tab-label ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkNotebook:menu-label ##### -->
 <para>
 
@@ -529,6 +524,11 @@ Emitted when the user or a function changes the current page.
 
 </para>
 
+<!-- ##### ARG GtkNotebook:tab-label ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkNotebook:tab-pack ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkoldeditable.sgml b/docs/reference/gtk/tmpl/gtkoldeditable.sgml
index 2f0580157f..8089870dcd 100644
--- a/docs/reference/gtk/tmpl/gtkoldeditable.sgml
+++ b/docs/reference/gtk/tmpl/gtkoldeditable.sgml
@@ -153,13 +153,13 @@ GtkOldEditable
 @oldeditable: the object which received the signal.
 @arg1: 
 
-<!-- ##### ARG GtkOldEditable:text-position ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkOldEditable:editable ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG GtkOldEditable:text-position ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
index 876a046a5d..31debc57f8 100644
--- a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
+++ b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
@@ -100,13 +100,13 @@ selected value for the option menu.
 
 </para>
 
-<!-- ##### ARG GtkOptionMenu:indicator-spacing ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkOptionMenu:indicator-size ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG GtkOptionMenu:indicator-spacing ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkprogressbar.sgml b/docs/reference/gtk/tmpl/gtkprogressbar.sgml
index 9125f6bfa4..70340b00fb 100644
--- a/docs/reference/gtk/tmpl/gtkprogressbar.sgml
+++ b/docs/reference/gtk/tmpl/gtkprogressbar.sgml
@@ -272,22 +272,12 @@ gtk_progress_set_percentage() instead.
 @percentage: the new percent complete value.
 
 
-<!-- ##### ARG GtkProgressBar:fraction ##### -->
+<!-- ##### ARG GtkProgressBar:activity-blocks ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkProgressBar:pulse-step ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkProgressBar:orientation ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkProgressBar:text ##### -->
+<!-- ##### ARG GtkProgressBar:activity-step ##### -->
 <para>
 
 </para>
@@ -302,18 +292,28 @@ gtk_progress_set_percentage() instead.
 
 </para>
 
-<!-- ##### ARG GtkProgressBar:activity-step ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkProgressBar:activity-blocks ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkProgressBar:discrete-blocks ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG GtkProgressBar:fraction ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkProgressBar:orientation ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkProgressBar:pulse-step ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkProgressBar:text ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkrange.sgml b/docs/reference/gtk/tmpl/gtkrange.sgml
index 77c9911363..af0d11f673 100644
--- a/docs/reference/gtk/tmpl/gtkrange.sgml
+++ b/docs/reference/gtk/tmpl/gtkrange.sgml
@@ -138,11 +138,6 @@ Emitted when the range value changes.
 
 @range: the #GtkRange
 
-<!-- ##### ARG GtkRange:update-policy ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkRange:adjustment ##### -->
 <para>
 
@@ -153,17 +148,7 @@ Emitted when the range value changes.
 
 </para>
 
-<!-- ##### ARG GtkRange:trough-border ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkRange:stepper-spacing ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkRange:arrow-displacement-y ##### -->
+<!-- ##### ARG GtkRange:update-policy ##### -->
 <para>
 
 </para>
@@ -173,7 +158,7 @@ Emitted when the range value changes.
 
 </para>
 
-<!-- ##### ARG GtkRange:stepper-size ##### -->
+<!-- ##### ARG GtkRange:arrow-displacement-y ##### -->
 <para>
 
 </para>
@@ -183,3 +168,18 @@ Emitted when the range value changes.
 
 </para>
 
+<!-- ##### ARG GtkRange:stepper-size ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkRange:stepper-spacing ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkRange:trough-border ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkruler.sgml b/docs/reference/gtk/tmpl/gtkruler.sgml
index 9c24b2abc9..1b19ad0545 100644
--- a/docs/reference/gtk/tmpl/gtkruler.sgml
+++ b/docs/reference/gtk/tmpl/gtkruler.sgml
@@ -95,7 +95,7 @@ This sets the range of the ruler using gfloat lower, gfloat upper, gfloat positi
 
 </para>
 
-<!-- ##### ARG GtkRuler:upper ##### -->
+<!-- ##### ARG GtkRuler:max-size ##### -->
 <para>
 
 </para>
@@ -105,7 +105,7 @@ This sets the range of the ruler using gfloat lower, gfloat upper, gfloat positi
 
 </para>
 
-<!-- ##### ARG GtkRuler:max-size ##### -->
+<!-- ##### ARG GtkRuler:upper ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkscrollbar.sgml b/docs/reference/gtk/tmpl/gtkscrollbar.sgml
index 385cba1265..16c201e309 100644
--- a/docs/reference/gtk/tmpl/gtkscrollbar.sgml
+++ b/docs/reference/gtk/tmpl/gtkscrollbar.sgml
@@ -59,12 +59,12 @@ The #GtkScrollbar struct does not contain any public data.
 
 </para>
 
-<!-- ##### ARG GtkScrollbar:min-slider-length ##### -->
+<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### -->
+<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### -->
 <para>
 
 </para>
@@ -79,7 +79,7 @@ The #GtkScrollbar struct does not contain any public data.
 
 </para>
 
-<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### -->
+<!-- ##### ARG GtkScrollbar:min-slider-length ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml b/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml
index ab6fd97a73..d93ec9fcbf 100644
--- a/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml
+++ b/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml
@@ -247,12 +247,17 @@ Sets the #GtkAdjustment for the vertical scrollbar.
 
 </para>
 
-<!-- ##### ARG GtkScrolledWindow:vadjustment ##### -->
+<!-- ##### ARG GtkScrolledWindow:hscrollbar-policy ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkScrolledWindow:hscrollbar-policy ##### -->
+<!-- ##### ARG GtkScrolledWindow:shadow-type ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkScrolledWindow:vadjustment ##### -->
 <para>
 
 </para>
@@ -267,7 +272,7 @@ Sets the #GtkAdjustment for the vertical scrollbar.
 
 </para>
 
-<!-- ##### ARG GtkScrolledWindow:shadow-type ##### -->
+<!-- ##### ARG GtkScrolledWindow:scrollbar-spacing ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtksettings.sgml b/docs/reference/gtk/tmpl/gtksettings.sgml
index 9b4b5cc451..41f4120633 100644
--- a/docs/reference/gtk/tmpl/gtksettings.sgml
+++ b/docs/reference/gtk/tmpl/gtksettings.sgml
@@ -164,7 +164,12 @@ GtkSettings
 @origin: 
 
 
-<!-- ##### ARG GtkSettings:gtk-double-click-time ##### -->
+<!-- ##### ARG GtkSettings:gtk-can-change-accels ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkSettings:gtk-color-palette ##### -->
 <para>
 
 </para>
@@ -179,31 +184,21 @@ GtkSettings
 
 </para>
 
-<!-- ##### ARG GtkSettings:gtk-split-cursor ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-theme-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-key-theme-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-menu-bar-accel ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkSettings:gtk-dnd-drag-threshold ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG GtkSettings:gtk-double-click-time ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkSettings:gtk-entry-select-on-focus ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkSettings:gtk-font-name ##### -->
 <para>
 
@@ -214,37 +209,37 @@ GtkSettings
 
 </para>
 
-<!-- ##### ARG GtkSettings:gtk-color-palette ##### -->
+<!-- ##### ARG GtkSettings:gtk-key-theme-name ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkSettings:gtk-entry-select-on-focus ##### -->
+<!-- ##### ARG GtkSettings:gtk-menu-bar-accel ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkSettings:gtk-menu-bar-popout-delay ##### -->
+<!-- ##### ARG GtkSettings:gtk-menu-bar-popup-delay ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkSettings:gtk-can-change-accels ##### -->
+<!-- ##### ARG GtkSettings:gtk-menu-popdown-delay ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkSettings:gtk-menu-popout-delay ##### -->
+<!-- ##### ARG GtkSettings:gtk-menu-popup-delay ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkSettings:gtk-menu-submenu-hysteresis ##### -->
+<!-- ##### ARG GtkSettings:gtk-split-cursor ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkSettings:gtk-toolbar-style ##### -->
+<!-- ##### ARG GtkSettings:gtk-theme-name ##### -->
 <para>
 
 </para>
@@ -254,3 +249,8 @@ GtkSettings
 
 </para>
 
+<!-- ##### ARG GtkSettings:gtk-toolbar-style ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkspinbutton.sgml b/docs/reference/gtk/tmpl/gtkspinbutton.sgml
index a1daff7548..4db30eaf08 100644
--- a/docs/reference/gtk/tmpl/gtkspinbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkspinbutton.sgml
@@ -448,17 +448,12 @@ use gtk_spin_button_get_value() instead.
 
 </para>
 
-<!-- ##### ARG GtkSpinButton:snap-to-ticks ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkSpinButton:numeric ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkSpinButton:wrap ##### -->
+<!-- ##### ARG GtkSpinButton:snap-to-ticks ##### -->
 <para>
 
 </para>
@@ -473,6 +468,11 @@ use gtk_spin_button_get_value() instead.
 
 </para>
 
+<!-- ##### ARG GtkSpinButton:wrap ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkSpinButton:shadow-type ##### -->
 <para>
 the type of border that surrounds the arrows of a spin button.
diff --git a/docs/reference/gtk/tmpl/gtkstatusbar.sgml b/docs/reference/gtk/tmpl/gtkstatusbar.sgml
index 0d575b6cc3..4d7ea2688b 100644
--- a/docs/reference/gtk/tmpl/gtkstatusbar.sgml
+++ b/docs/reference/gtk/tmpl/gtkstatusbar.sgml
@@ -51,15 +51,6 @@ The message at the top of the stack can be removed using gtk_statusbar_pop(). A
 Contains private data that should be modified with the functions described below.
 </para>
 
-@parent_widget: 
-@frame: 
-@label: 
-@messages: 
-@keys: 
-@seq_context_id: 
-@seq_message_id: 
-@grip_window: 
-@has_resize_grip: 
 
 <!-- ##### FUNCTION gtk_statusbar_new ##### -->
 <para>
@@ -129,3 +120,26 @@ Returns whether the statusbar has a resize grip.
 @Returns: %TRUE if the statusbar has a resize grip.
 
 
+<!-- ##### SIGNAL GtkStatusbar::text-popped ##### -->
+<para>
+Is emitted whenever a new message is popped off a statusbar's stack.
+</para>
+
+@statusbar: the object which received the signal.
+@context_id: the context id of the relevant message/statusbar.
+@text: the message that was just popped.
+
+<!-- ##### SIGNAL GtkStatusbar::text-pushed ##### -->
+<para>
+Is emitted whenever a new message gets pushed onto a statusbar's stack.
+</para>
+
+@statusbar: the object which received the signal.
+@context_id: the context id of the relevant message/statusbar.
+@text: the message that was pushed.
+
+<!-- ##### ARG GtkStatusbar:shadow-type ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtktable.sgml b/docs/reference/gtk/tmpl/gtktable.sgml
index 7fda888960..b1702965b8 100644
--- a/docs/reference/gtk/tmpl/gtktable.sgml
+++ b/docs/reference/gtk/tmpl/gtktable.sgml
@@ -251,7 +251,12 @@ to %FALSE if this is not your desired behaviour.
 @Returns: 
 
 
-<!-- ##### ARG GtkTable:n-rows ##### -->
+<!-- ##### ARG GtkTable:column-spacing ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTable:homogeneous ##### -->
 <para>
 
 </para>
@@ -261,7 +266,7 @@ to %FALSE if this is not your desired behaviour.
 
 </para>
 
-<!-- ##### ARG GtkTable:column-spacing ##### -->
+<!-- ##### ARG GtkTable:n-rows ##### -->
 <para>
 
 </para>
@@ -271,7 +276,7 @@ to %FALSE if this is not your desired behaviour.
 
 </para>
 
-<!-- ##### ARG GtkTable:homogeneous ##### -->
+<!-- ##### ARG GtkTable:bottom-attach ##### -->
 <para>
 
 </para>
@@ -291,26 +296,21 @@ to %FALSE if this is not your desired behaviour.
 
 </para>
 
-<!-- ##### ARG GtkTable:bottom-attach ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkTable:x-options ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkTable:y-options ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkTable:x-padding ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG GtkTable:y-options ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkTable:y-padding ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtktext.sgml b/docs/reference/gtk/tmpl/gtktext.sgml
index 8fe23bf62e..ca1a942c3d 100644
--- a/docs/reference/gtk/tmpl/gtktext.sgml
+++ b/docs/reference/gtk/tmpl/gtktext.sgml
@@ -217,17 +217,17 @@ Used by the #GtkText widget to keep track of the size of it's horizontal
 text.
 </para>
 
+<!-- ##### ARG GtkText:line-wrap ##### -->
+<para>
+Boolean value indicating whether line wrap is enabled or not.
+</para>
+
 <!-- ##### ARG GtkText:vadjustment ##### -->
 <para>
 Used by the #GtkText widget to keep track of the size of it's vertical
 text.
 </para>
 
-<!-- ##### ARG GtkText:line-wrap ##### -->
-<para>
-Boolean value indicating whether line wrap is enabled or not.
-</para>
-
 <!-- ##### ARG GtkText:word-wrap ##### -->
 <para>
 Boolean value indicated whether word wrap is enabled or not.
diff --git a/docs/reference/gtk/tmpl/gtktexttag.sgml b/docs/reference/gtk/tmpl/gtktexttag.sgml
index 31a39e94ac..34119845a8 100644
--- a/docs/reference/gtk/tmpl/gtktexttag.sgml
+++ b/docs/reference/gtk/tmpl/gtktexttag.sgml
@@ -187,17 +187,17 @@ modified directly.
 @arg2: 
 @Returns: 
 
-<!-- ##### ARG GtkTextTag:name ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkTextTag:background ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkTextTag:foreground ##### -->
+<!-- ##### ARG GtkTextTag:background-full-height ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:background-full-height-set ##### -->
 <para>
 
 </para>
@@ -207,7 +207,7 @@ modified directly.
 
 </para>
 
-<!-- ##### ARG GtkTextTag:foreground-gdk ##### -->
+<!-- ##### ARG GtkTextTag:background-set ##### -->
 <para>
 
 </para>
@@ -217,7 +217,32 @@ modified directly.
 
 </para>
 
-<!-- ##### ARG GtkTextTag:foreground-stipple ##### -->
+<!-- ##### ARG GtkTextTag:background-stipple-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:direction ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:editable ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:editable-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:family ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:family-set ##### -->
 <para>
 
 </para>
@@ -232,27 +257,142 @@ modified directly.
 
 </para>
 
-<!-- ##### ARG GtkTextTag:family ##### -->
+<!-- ##### ARG GtkTextTag:foreground ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkTextTag:style ##### -->
+<!-- ##### ARG GtkTextTag:foreground-gdk ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkTextTag:variant ##### -->
+<!-- ##### ARG GtkTextTag:foreground-set ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkTextTag:weight ##### -->
+<!-- ##### ARG GtkTextTag:foreground-stipple ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkTextTag:stretch ##### -->
+<!-- ##### ARG GtkTextTag:foreground-stipple-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:indent ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:indent-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:invisible ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:invisible-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:justification ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:justification-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:language ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:language-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:left-margin ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:left-margin-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:name ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:pixels-above-lines ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:pixels-above-lines-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:pixels-below-lines ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:pixels-below-lines-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:pixels-inside-wrap ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:pixels-inside-wrap-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:right-margin ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:right-margin-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:rise ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:rise-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:scale ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:scale-set ##### -->
 <para>
 
 </para>
@@ -267,132 +407,12 @@ modified directly.
 
 </para>
 
-<!-- ##### ARG GtkTextTag:scale ##### -->
+<!-- ##### ARG GtkTextTag:size-set ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkTextTag:pixels-above-lines ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:pixels-below-lines ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:pixels-inside-wrap ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:editable ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:wrap-mode ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:justification ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:direction ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:left-margin ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:indent ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:strikethrough ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:right-margin ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:underline ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:rise ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:background-full-height ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:language ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:tabs ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:invisible ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:background-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:foreground-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:background-stipple-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:foreground-stipple-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:family-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:style-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:variant-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:weight-set ##### -->
+<!-- ##### ARG GtkTextTag:stretch ##### -->
 <para>
 
 </para>
@@ -402,52 +422,7 @@ modified directly.
 
 </para>
 
-<!-- ##### ARG GtkTextTag:size-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:scale-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:pixels-above-lines-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:pixels-below-lines-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:pixels-inside-wrap-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:editable-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:wrap-mode-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:justification-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:left-margin-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:indent-set ##### -->
+<!-- ##### ARG GtkTextTag:strikethrough ##### -->
 <para>
 
 </para>
@@ -457,27 +432,17 @@ modified directly.
 
 </para>
 
-<!-- ##### ARG GtkTextTag:right-margin-set ##### -->
+<!-- ##### ARG GtkTextTag:style ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkTextTag:underline-set ##### -->
+<!-- ##### ARG GtkTextTag:style-set ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkTextTag:rise-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:background-full-height-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextTag:language-set ##### -->
+<!-- ##### ARG GtkTextTag:tabs ##### -->
 <para>
 
 </para>
@@ -487,7 +452,42 @@ modified directly.
 
 </para>
 
-<!-- ##### ARG GtkTextTag:invisible-set ##### -->
+<!-- ##### ARG GtkTextTag:underline ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:underline-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:variant ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:variant-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:weight ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:weight-set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:wrap-mode ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:wrap-mode-set ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtktextview.sgml b/docs/reference/gtk/tmpl/gtktextview.sgml
index af3f7a7d1c..0585dfed78 100644
--- a/docs/reference/gtk/tmpl/gtktextview.sgml
+++ b/docs/reference/gtk/tmpl/gtktextview.sgml
@@ -689,6 +689,31 @@ in an idle job in the background.
 
 @textview: the object which received the signal.
 
+<!-- ##### ARG GtkTextView:cursor-visible ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextView:editable ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextView:indent ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextView:justification ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextView:left-margin ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkTextView:pixels-above-lines ##### -->
 <para>
 
@@ -704,42 +729,17 @@ in an idle job in the background.
 
 </para>
 
-<!-- ##### ARG GtkTextView:editable ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextView:wrap-mode ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextView:justification ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextView:left-margin ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkTextView:right-margin ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkTextView:indent ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkTextView:tabs ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkTextView:cursor-visible ##### -->
+<!-- ##### ARG GtkTextView:wrap-mode ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtktipsquery.sgml b/docs/reference/gtk/tmpl/gtktipsquery.sgml
index b54124b77c..7d1f7b00b7 100644
--- a/docs/reference/gtk/tmpl/gtktipsquery.sgml
+++ b/docs/reference/gtk/tmpl/gtktipsquery.sgml
@@ -133,12 +133,6 @@ Emitted when a widget is selected during a query.
 @event: the button press or button release event.
 @Returns: %TRUE if the query should be stopped.
 
-<!-- ##### ARG GtkTipsQuery:emit-always ##### -->
-<para>
-%TRUE if the widget-entered and widget-selected signals are emitted even when
-the widget has no tooltip set.
-</para>
-
 <!-- ##### ARG GtkTipsQuery:caller ##### -->
 <para>
 The widget that starts the tips query, usually a button.
@@ -146,6 +140,12 @@ If it is selected while the query is in effect the query is automatically
 stopped.
 </para>
 
+<!-- ##### ARG GtkTipsQuery:emit-always ##### -->
+<para>
+%TRUE if the widget-entered and widget-selected signals are emitted even when
+the widget has no tooltip set.
+</para>
+
 <!-- ##### ARG GtkTipsQuery:label-inactive ##### -->
 <para>
 The text to display in the #GtkTipsQuery widget when the query is not in
diff --git a/docs/reference/gtk/tmpl/gtktogglebutton.sgml b/docs/reference/gtk/tmpl/gtktogglebutton.sgml
index 03a51e8a0c..3598dc63fc 100644
--- a/docs/reference/gtk/tmpl/gtktogglebutton.sgml
+++ b/docs/reference/gtk/tmpl/gtktogglebutton.sgml
@@ -191,13 +191,13 @@ Should be connected if you wish to perform an action whenever the
 
 </para>
 
-<!-- ##### ARG GtkToggleButton:inconsistent ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkToggleButton:draw-indicator ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG GtkToggleButton:inconsistent ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml
index 64cd3bc451..71686ff362 100644
--- a/docs/reference/gtk/tmpl/gtktoolbar.sgml
+++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml
@@ -386,28 +386,28 @@ Should be used if you wish to perform an action when ever the style of a toolbar
 
 </para>
 
-<!-- ##### ARG GtkToolbar:shadow-type ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkToolbar:button-relief ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkToolbar:space-style ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkToolbar:space-size ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkToolbar:internal-padding ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG GtkToolbar:shadow-type ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkToolbar:space-size ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkToolbar:space-style ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtktreestore.sgml b/docs/reference/gtk/tmpl/gtktreestore.sgml
index 3661f84590..2c1bf10608 100644
--- a/docs/reference/gtk/tmpl/gtktreestore.sgml
+++ b/docs/reference/gtk/tmpl/gtktreestore.sgml
@@ -4,7 +4,6 @@ GtkTreeStore
 <!-- ##### SECTION Short_Description ##### -->
 A tree-like data structure that can be used with the #GtkTreeView
 
-
 <!-- ##### SECTION Long_Description ##### -->
 <para>
 The #GtkTreeStore object is a list model for use with a #GtkTreeView
diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml
index 2ea9c10945..7317743b66 100644
--- a/docs/reference/gtk/tmpl/gtktreeview.sgml
+++ b/docs/reference/gtk/tmpl/gtktreeview.sgml
@@ -872,7 +872,12 @@ Function used for #gtk_tree_view_map_expanded_rows.
 
 @treeview: the object which received the signal.
 
-<!-- ##### ARG GtkTreeView:model ##### -->
+<!-- ##### ARG GtkTreeView:enable-search ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTreeView:expander-column ##### -->
 <para>
 
 </para>
@@ -882,7 +887,7 @@ Function used for #gtk_tree_view_map_expanded_rows.
 
 </para>
 
-<!-- ##### ARG GtkTreeView:vadjustment ##### -->
+<!-- ##### ARG GtkTreeView:headers-clickable ##### -->
 <para>
 
 </para>
@@ -892,12 +897,7 @@ Function used for #gtk_tree_view_map_expanded_rows.
 
 </para>
 
-<!-- ##### ARG GtkTreeView:headers-clickable ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTreeView:expander-column ##### -->
+<!-- ##### ARG GtkTreeView:model ##### -->
 <para>
 
 </para>
@@ -912,17 +912,12 @@ Function used for #gtk_tree_view_map_expanded_rows.
 
 </para>
 
-<!-- ##### ARG GtkTreeView:enable-search ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkTreeView:search-column ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkTreeView:vertical-separator ##### -->
+<!-- ##### ARG GtkTreeView:vadjustment ##### -->
 <para>
 
 </para>
@@ -932,12 +927,12 @@ Function used for #gtk_tree_view_map_expanded_rows.
 
 </para>
 
-<!-- ##### ARG GtkTreeView:expander-size ##### -->
+<!-- ##### ARG GtkTreeView:even-row-color ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkTreeView:indent-expanders ##### -->
+<!-- ##### ARG GtkTreeView:expander-size ##### -->
 <para>
 
 </para>
@@ -947,3 +942,18 @@ Function used for #gtk_tree_view_map_expanded_rows.
 
 </para>
 
+<!-- ##### ARG GtkTreeView:indent-expanders ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTreeView:odd-row-color ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTreeView:vertical-separator ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
index 6710dcfd36..1ba872b12e 100644
--- a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
+++ b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
@@ -487,42 +487,7 @@ calling gtk_tree_view_column_set_cell_data_func()
 
 @treeviewcolumn: the object which received the signal.
 
-<!-- ##### ARG GtkTreeViewColumn:visible ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTreeViewColumn:resizable ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTreeViewColumn:width ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTreeViewColumn:sizing ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTreeViewColumn:fixed-width ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTreeViewColumn:min-width ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTreeViewColumn:max-width ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTreeViewColumn:title ##### -->
+<!-- ##### ARG GtkTreeViewColumn:alignment ##### -->
 <para>
 
 </para>
@@ -532,12 +497,17 @@ calling gtk_tree_view_column_set_cell_data_func()
 
 </para>
 
-<!-- ##### ARG GtkTreeViewColumn:widget ##### -->
+<!-- ##### ARG GtkTreeViewColumn:fixed-width ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkTreeViewColumn:alignment ##### -->
+<!-- ##### ARG GtkTreeViewColumn:max-width ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTreeViewColumn:min-width ##### -->
 <para>
 
 </para>
@@ -547,6 +517,16 @@ calling gtk_tree_view_column_set_cell_data_func()
 
 </para>
 
+<!-- ##### ARG GtkTreeViewColumn:resizable ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTreeViewColumn:sizing ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkTreeViewColumn:sort-indicator ##### -->
 <para>
 
@@ -557,3 +537,23 @@ calling gtk_tree_view_column_set_cell_data_func()
 
 </para>
 
+<!-- ##### ARG GtkTreeViewColumn:title ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTreeViewColumn:visible ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTreeViewColumn:widget ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTreeViewColumn:width ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkviewport.sgml b/docs/reference/gtk/tmpl/gtkviewport.sgml
index f944fa0aa6..f001d3cf91 100644
--- a/docs/reference/gtk/tmpl/gtkviewport.sgml
+++ b/docs/reference/gtk/tmpl/gtkviewport.sgml
@@ -98,13 +98,13 @@ GtkViewport
 
 </para>
 
-<!-- ##### ARG GtkViewport:vadjustment ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkViewport:shadow-type ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG GtkViewport:vadjustment ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml
index fbafa97ecc..a098de73fb 100644
--- a/docs/reference/gtk/tmpl/gtkwidget.sgml
+++ b/docs/reference/gtk/tmpl/gtkwidget.sgml
@@ -1852,6 +1852,8 @@ a widget changes from un-anchored to anchored or vice-versa.
 </para>
 
 @widget: the object which received the signal.
+@widget2: 
+<!-- # Unused Parameters # -->
 @widget: 
 
 <!-- ##### SIGNAL GtkWidget::key-press-event ##### -->
@@ -2118,67 +2120,17 @@ a widget changes from un-anchored to anchored or vice-versa.
 @event: 
 @Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further.
 
-<!-- ##### ARG GtkWidget:name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkWidget:parent ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkWidget:width-request ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkWidget:height-request ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkWidget:visible ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkWidget:sensitive ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkWidget:app-paintable ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:can-focus ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkWidget:is-focus ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkWidget:has-focus ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkWidget:can-default ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:has-default ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkWidget:receives-default ##### -->
+<!-- ##### ARG GtkWidget:can-focus ##### -->
 <para>
 
 </para>
@@ -2188,11 +2140,6 @@ a widget changes from un-anchored to anchored or vice-versa.
 
 </para>
 
-<!-- ##### ARG GtkWidget:style ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkWidget:events ##### -->
 <para>
 
@@ -2203,21 +2150,66 @@ a widget changes from un-anchored to anchored or vice-versa.
 
 </para>
 
+<!-- ##### ARG GtkWidget:has-default ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWidget:has-focus ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWidget:height-request ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWidget:is-focus ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWidget:name ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWidget:parent ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWidget:receives-default ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWidget:sensitive ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWidget:style ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWidget:visible ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWidget:width-request ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:focus-line-width ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkWidget:interior-focus ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkWidget:cursor-color ##### -->
 <para>
 
@@ -2228,11 +2220,21 @@ a widget changes from un-anchored to anchored or vice-versa.
 
 </para>
 
+<!-- ##### ARG GtkWidget:focus-line-width ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkWidget:focus-padding ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG GtkWidget:interior-focus ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkWidget:secondary-cursor-color ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkwindow.sgml b/docs/reference/gtk/tmpl/gtkwindow.sgml
index 5376d69fed..de8057d446 100644
--- a/docs/reference/gtk/tmpl/gtkwindow.sgml
+++ b/docs/reference/gtk/tmpl/gtkwindow.sgml
@@ -857,12 +857,7 @@ Deprecated alias for gtk_window_set_position().
 @window: the object which received the signal.
 @widget: 
 
-<!-- ##### ARG GtkWindow:type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkWindow:title ##### -->
+<!-- ##### ARG GtkWindow:allow-grow ##### -->
 <para>
 
 </para>
@@ -872,22 +867,7 @@ Deprecated alias for gtk_window_set_position().
 
 </para>
 
-<!-- ##### ARG GtkWindow:allow-grow ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkWindow:resizable ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkWindow:modal ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkWindow:window-position ##### -->
+<!-- ##### ARG GtkWindow:default-height ##### -->
 <para>
 
 </para>
@@ -897,48 +877,68 @@ Deprecated alias for gtk_window_set_position().
 
 </para>
 
-<!-- ##### ARG GtkWindow:default-height ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkWindow:destroy-with-parent ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWindow:icon ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkWindow:screen ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkWindow:type-hint ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkWindow:skip-taskbar-hint ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkWindow:skip-pager-hint ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkWindow:is-active ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkWindow:has-toplevel-focus ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG GtkWindow:icon ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWindow:is-active ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWindow:modal ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWindow:resizable ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWindow:screen ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWindow:skip-pager-hint ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWindow:skip-taskbar-hint ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWindow:title ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWindow:type ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWindow:type-hint ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWindow:window-position ##### -->
+<para>
+
+</para>
+