11 files changed, 43 insertions, 59 deletions
diff --git a/docs/reference/gtk/tmpl/gtkbbox.sgml b/docs/reference/gtk/tmpl/gtkbbox.sgml
index d48f2ae89..46d633dc5 100644
--- a/docs/reference/gtk/tmpl/gtkbbox.sgml
+++ b/docs/reference/gtk/tmpl/gtkbbox.sgml
@@ -162,22 +162,22 @@ box.
 
 </para>
 
-<!-- ##### ARG GtkButtonBox:child-min-height ##### -->
+<!-- ##### ARG GtkButtonBox:child-internal-pad-x ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkButtonBox:child-internal-pad-y ##### -->
+<!-- ##### ARG GtkButtonBox:child-min-height ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkButtonBox:child-internal-pad-x ##### -->
+<!-- ##### ARG GtkButtonBox:child-min-width ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkButtonBox:child-min-width ##### -->
+<!-- ##### ARG GtkButtonBox:child-internal-pad-y ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkbutton.sgml b/docs/reference/gtk/tmpl/gtkbutton.sgml
index 1b60ff31a..ecc477c1d 100644
--- a/docs/reference/gtk/tmpl/gtkbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkbutton.sgml
@@ -248,17 +248,17 @@ mouse cursor is.
 
 </para>
 
-<!-- ##### ARG GtkButton:default-border ##### -->
+<!-- ##### ARG GtkButton:child-displacement-y ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkButton:child-displacement-y ##### -->
+<!-- ##### ARG GtkButton:child-displacement-x ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkButton:child-displacement-x ##### -->
+<!-- ##### ARG GtkButton:default-border ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkdialog.sgml b/docs/reference/gtk/tmpl/gtkdialog.sgml
index 24dc48ecd..721baf0fb 100644
--- a/docs/reference/gtk/tmpl/gtkdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkdialog.sgml
@@ -299,12 +299,12 @@ was clicked.
 
 </para>
 
-<!-- ##### ARG GtkDialog:content-area-border ##### -->
+<!-- ##### ARG GtkDialog:action-area-border ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkDialog:action-area-border ##### -->
+<!-- ##### ARG GtkDialog:content-area-border ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
index 876a046a5..31debc57f 100644
--- a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
+++ b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
@@ -100,12 +100,12 @@ selected value for the option menu.
 
 </para>
 
-<!-- ##### ARG GtkOptionMenu:indicator-spacing ##### -->
+<!-- ##### ARG GtkOptionMenu:indicator-size ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkOptionMenu:indicator-size ##### -->
+<!-- ##### ARG GtkOptionMenu:indicator-spacing ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkrange.sgml b/docs/reference/gtk/tmpl/gtkrange.sgml
index caa4ee436..7ce45ef6e 100644
--- a/docs/reference/gtk/tmpl/gtkrange.sgml
+++ b/docs/reference/gtk/tmpl/gtkrange.sgml
@@ -153,32 +153,32 @@ Emitted when the range value changes.
 
 </para>
 
-<!-- ##### ARG GtkRange:stepper-size ##### -->
+<!-- ##### ARG GtkRange:trough-border ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkRange:trough-border ##### -->
+<!-- ##### ARG GtkRange:arrow-displacement-y ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkRange:stepper-spacing ##### -->
+<!-- ##### ARG GtkRange:arrow-displacement-x ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkRange:slider-width ##### -->
+<!-- ##### ARG GtkRange:stepper-size ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkRange:arrow-displacement-y ##### -->
+<!-- ##### ARG GtkRange:stepper-spacing ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkRange:arrow-displacement-x ##### -->
+<!-- ##### ARG GtkRange:slider-width ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkscale.sgml b/docs/reference/gtk/tmpl/gtkscale.sgml
index d2861f190..8935f1164 100644
--- a/docs/reference/gtk/tmpl/gtkscale.sgml
+++ b/docs/reference/gtk/tmpl/gtkscale.sgml
@@ -148,12 +148,12 @@ format_value_callback (GtkScale *scale,
 
 </para>
 
-<!-- ##### ARG GtkScale:value-spacing ##### -->
+<!-- ##### ARG GtkScale:slider-length ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkScale:slider-length ##### -->
+<!-- ##### ARG GtkScale:value-spacing ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkscrollbar.sgml b/docs/reference/gtk/tmpl/gtkscrollbar.sgml
index 330691b46..f7710183a 100644
--- a/docs/reference/gtk/tmpl/gtkscrollbar.sgml
+++ b/docs/reference/gtk/tmpl/gtkscrollbar.sgml
@@ -54,17 +54,17 @@ The #GtkScrollbar struct does not contain any public data.
 </para>
 
 
-<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### -->
+<!-- ##### ARG GtkScrollbar:has-secondary-backward-stepper ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkScrollbar:has-secondary-backward-stepper ##### -->
+<!-- ##### ARG GtkScrollbar:min-slider-length ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### -->
+<!-- ##### ARG GtkScrollbar:fixed-slider-length ##### -->
 <para>
 
 </para>
@@ -74,12 +74,12 @@ The #GtkScrollbar struct does not contain any public data.
 
 </para>
 
-<!-- ##### ARG GtkScrollbar:min-slider-length ##### -->
+<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkScrollbar:fixed-slider-length ##### -->
+<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml
index 9ebf2d6d8..a7d25b3d6 100644
--- a/docs/reference/gtk/tmpl/gtktoolbar.sgml
+++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml
@@ -386,27 +386,27 @@ Should be used if you wish to perform an action when ever the style of a toolbar
 
 </para>
 
-<!-- ##### ARG GtkToolbar:shadow-type ##### -->
+<!-- ##### ARG GtkToolbar:internal-padding ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkToolbar:space-style ##### -->
+<!-- ##### ARG GtkToolbar:space-size ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkToolbar:button-relief ##### -->
+<!-- ##### ARG GtkToolbar:space-style ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkToolbar:internal-padding ##### -->
+<!-- ##### ARG GtkToolbar:shadow-type ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkToolbar:space-size ##### -->
+<!-- ##### ARG GtkToolbar:button-relief ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml
index 62f5fc3ac..70776581e 100644
--- a/docs/reference/gtk/tmpl/gtktreeview.sgml
+++ b/docs/reference/gtk/tmpl/gtktreeview.sgml
@@ -901,17 +901,17 @@ Function used for #gtk_tree_view_map_expanded_rows.
 
 </para>
 
-<!-- ##### ARG GtkTreeView:horizontal-separator ##### -->
+<!-- ##### ARG GtkTreeView:vertical-separator ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkTreeView:indent-expanders ##### -->
+<!-- ##### ARG GtkTreeView:horizontal-separator ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkTreeView:allow-rules ##### -->
+<!-- ##### ARG GtkTreeView:indent-expanders ##### -->
 <para>
 
 </para>
@@ -921,7 +921,7 @@ Function used for #gtk_tree_view_map_expanded_rows.
 
 </para>
 
-<!-- ##### ARG GtkTreeView:vertical-separator ##### -->
+<!-- ##### ARG GtkTreeView:allow-rules ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtktypeutils.sgml b/docs/reference/gtk/tmpl/gtktypeutils.sgml
index 305bd7e96..db9adbfde 100644
--- a/docs/reference/gtk/tmpl/gtktypeutils.sgml
+++ b/docs/reference/gtk/tmpl/gtktypeutils.sgml
@@ -23,29 +23,13 @@ information about the type is held in a private struct named
 </para>
 
 
-<!-- ##### ENUM GtkFundamentalType ##### -->
+<!-- ##### TYPEDEF GtkFundamentalType ##### -->
 <para>
 #GtkFundamentalType is an enumerated type which lists all the possible
 fundamental types (e.g. <type>char</type>, <type>uchar</type>, <type>int</type>,
 <type>long</type>, <type>float</type>, etc).
 </para>
 
-@GTK_TYPE_INVALID: 
-@GTK_TYPE_NONE: 
-@GTK_TYPE_ENUM: 
-@GTK_TYPE_FLAGS: 
-@GTK_TYPE_CHAR: 
-@GTK_TYPE_UCHAR: 
-@GTK_TYPE_BOOL: 
-@GTK_TYPE_INT: 
-@GTK_TYPE_UINT: 
-@GTK_TYPE_LONG: 
-@GTK_TYPE_ULONG: 
-@GTK_TYPE_FLOAT: 
-@GTK_TYPE_DOUBLE: 
-@GTK_TYPE_STRING: 
-@GTK_TYPE_BOXED: 
-@GTK_TYPE_POINTER: 
 
 <!-- ##### MACRO GTK_CLASS_NAME ##### -->
 <para>
diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml
index ab7a967a5..d3cdd9ebe 100644
--- a/docs/reference/gtk/tmpl/gtkwidget.sgml
+++ b/docs/reference/gtk/tmpl/gtkwidget.sgml
@@ -2158,12 +2158,12 @@ a widget changes from un-anchored to anchored or vice-versa.
 
 </para>
 
-<!-- ##### ARG GtkWidget:is-focus ##### -->
+<!-- ##### ARG GtkWidget:has-focus ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:has-focus ##### -->
+<!-- ##### ARG GtkWidget:is-focus ##### -->
 <para>
 
 </para>
@@ -2203,37 +2203,37 @@ a widget changes from un-anchored to anchored or vice-versa.
 
 </para>
 
-<!-- ##### ARG GtkWidget:focus-padding ##### -->
+<!-- ##### ARG GtkWidget:secondary-cursor-color ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:cursor-color ##### -->
+<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:secondary-cursor-color ##### -->
+<!-- ##### ARG GtkWidget:cursor-color ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:interior-focus ##### -->
+<!-- ##### ARG GtkWidget:focus-line-width ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:focus-line-width ##### -->
+<!-- ##### ARG GtkWidget:focus-padding ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### -->
+<!-- ##### ARG GtkWidget:focus-line-pattern ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:focus-line-pattern ##### -->
+<!-- ##### ARG GtkWidget:interior-focus ##### -->
 <para>
 
 </para>