diff --git a/docs/reference/gobject/tmpl/enumerations_flags.sgml b/docs/reference/gobject/tmpl/enumerations_flags.sgml
index 1293d2fd8..2b72931f2 100644
--- a/docs/reference/gobject/tmpl/enumerations_flags.sgml
+++ b/docs/reference/gobject/tmpl/enumerations_flags.sgml
@@ -232,13 +232,11 @@ than to write one yourself using g_enum_register_static().
 </para>
 
 @name: A nul-terminated string used as the name of the new type.
-@_static_values: 
-@Returns: The new type identifier.
-<!-- # Unused Parameters # -->
 @const_static_values: An array of #GEnumValue structs for the possible
   enumeration values. The array is terminated by a struct with all 
   members being 0. GObject keeps a reference to the data, so it cannot
   be stack-allocated.
+@Returns: The new type identifier.
 
 
 <!-- ##### FUNCTION g_flags_register_static ##### -->
@@ -252,12 +250,10 @@ than to write one yourself using g_flags_register_static().
 </para>
 
 @name: A nul-terminated string used as the name of the new type.
-@_static_values: 
-@Returns: The new type identifier.
-<!-- # Unused Parameters # -->
 @const_static_values: An array of #GFlagsValue structs for the possible
   flags values. The array is terminated by a struct with all members being 0.
   GObject keeps a reference to the data, so it cannot be stack-allocated.
+@Returns: The new type identifier.
 
 
 <!-- ##### FUNCTION g_enum_complete_type_info ##### -->
@@ -286,8 +282,6 @@ my_enum_complete_type_info (GTypePlugin     *plugin,
 
 @g_enum_type: the type identifier of the type being completed
 @info: the #GTypeInfo struct to be filled in
-@_values: 
-<!-- # Unused Parameters # -->
 @const_values: An array of #GEnumValue structs for the possible
   enumeration values. The array is terminated by a struct with all 
   members being 0.
@@ -302,8 +296,6 @@ g_enumeration_complete_type_info() above.
 
 @g_flags_type: the type identifier of the type being completed
 @info: the #GTypeInfo struct to be filled in
-@_values: 
-<!-- # Unused Parameters # -->
 @const_values: An array of #GFlagsValue structs for the possible
   enumeration values. The array is terminated by a struct with all 
   members being 0.
diff --git a/docs/reference/gobject/tmpl/gparamspec.sgml b/docs/reference/gobject/tmpl/gparamspec.sgml
index 22dfffff5..f395dcfcb 100644
--- a/docs/reference/gobject/tmpl/gparamspec.sgml
+++ b/docs/reference/gobject/tmpl/gparamspec.sgml
@@ -149,8 +149,12 @@ can be configured.
                          parameter is guaranteed to remain valid and
                          unmodified for the lifetime of the parameter. 
                          Since 2.8
-@G_PARAM_PRIVATE: 
-@G_PARAM_STATIC_NICK: 
+@G_PARAM_PRIVATE:        Old name for the %G_PARAM_STATIC_NAME flag. 
+                         Deprecated since 2.8. 
+@G_PARAM_STATIC_NICK:    the string used as nick when constructing the 
+                         parameter is guaranteed to remain valid and 
+                         unmodified for the lifetime of the parameter. 
+                         Since 2.8
 @G_PARAM_STATIC_BLURB:   the string used as blurb when constructing the 
                          parameter is guaranteed to remain valid and 
                          unmodified for the lifetime of the parameter. 
diff --git a/docs/reference/gobject/tmpl/gtype.sgml b/docs/reference/gobject/tmpl/gtype.sgml
index ace29c32b..692c000c7 100644
--- a/docs/reference/gobject/tmpl/gtype.sgml
+++ b/docs/reference/gobject/tmpl/gtype.sgml
@@ -1630,19 +1630,13 @@ instance and class structure and the definitions of the instance and class
 init functions.
 </informalexample>
 
-@TN: 
-@t_n: 
-@T_P: 
-@_f_: 
-@_C_: 
-@Since: 2.4
-<!-- # Unused Parameters # -->
-@TypeName: The name of the new type, in Camel case.
-@type_name: The name of the new type, in lowercase, with words 
+@TN: The name of the new type, in Camel case.
+@t_n: The name of the new type, in lowercase, with words 
   separated by '_'.
-@TYPE_PARENT: The #GType of the parent type.
-@flags: #GTypeFlags to pass to g_type_register_static()
-@CODE: Custom code that gets inserted in the *_get_type() function.
+@T_P: The #GType of the parent type.
+@_f_: #GTypeFlags to pass to g_type_register_static()
+@_C_: Custom code that gets inserted in the *_get_type() function.
+@Since: 2.4
 
 
 <!-- ##### MACRO G_TYPE_INVALID ##### -->
diff --git a/docs/reference/gobject/tmpl/gtypemodule.sgml b/docs/reference/gobject/tmpl/gtypemodule.sgml
index 3b2e9ee75..71ce8f1a0 100644
--- a/docs/reference/gobject/tmpl/gtypemodule.sgml
+++ b/docs/reference/gobject/tmpl/gtypemodule.sgml
@@ -164,13 +164,11 @@ not be unloaded.
 
 @module:              a #GTypeModule
 @name:                name for the type
-@_static_values: 
-@Returns: the new or existing type ID
-@Since: 2.6
-<!-- # Unused Parameters # -->
 @const_static_values: an array of #GEnumValue structs for the possible
   enumeration values. The array is terminated by a struct with all 
   members being 0.
+@Returns: the new or existing type ID
+@Since: 2.6
 
 
 <!-- ##### FUNCTION g_type_module_register_flags ##### -->
@@ -187,13 +185,11 @@ not be unloaded.
 
 @module:              a #GTypeModule
 @name:                name for the type
-@_static_values: 
-@Returns: the new or existing type ID
-@Since: 2.6
-<!-- # Unused Parameters # -->
 @const_static_values: an array of #GFlagsValue structs for the possible
   flags values. The array is terminated by a struct with all 
   members being 0.
+@Returns: the new or existing type ID
+@Since: 2.6
 
 
 <!-- ##### MACRO G_DEFINE_DYNAMIC_TYPE ##### -->