Updated

4 files changed, 112 insertions, 116 deletions

diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index e6e89eb62..de3234f95 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -132,6 +132,8 @@ be done by casting).
 
 @ephyembed: the object which received the signal.
 @arg1: 
+@Returns: 
+<!-- # Unused Parameters # -->
 @arg2: 
 
 <!-- ##### SIGNAL EphyEmbed::ge-popup-blocked ##### -->
@@ -189,6 +191,8 @@ be done by casting).
 @: 
 @:
 @: 
+@:
+@: 
 @: 
 
 <!-- ##### SIGNAL EphyEmbed::ge-security-change ##### -->
@@ -213,13 +217,12 @@ be done by casting).
 </para>
 
 @base_iface: 
-@context_menu: 
 @favicon: 
 @location: 
 @net_state: 
-@new_window: 
 @dom_mouse_click: 
 @dom_mouse_down: 
+@context_menu: 
 @popup_blocked: 
 @security_change: 
 @zoom_change: 
@@ -227,6 +230,7 @@ be done by casting).
 @modal_alert: 
 @modal_alert_closed: 
 @document_type: 
+@new_window: 
 @load_url: 
 @stop_load: 
 @reload: 
diff --git a/doc/reference/tmpl/ephy-glade.sgml b/doc/reference/tmpl/ephy-glade.sgml
index faa726514..4251a1684 100644
--- a/doc/reference/tmpl/ephy-glade.sgml
+++ b/doc/reference/tmpl/ephy-glade.sgml
@@ -20,16 +20,3 @@ After retrieving a #GladeXML object from ephy_glade_widget_new(), regular
 
 </para>
 
-<!-- ##### FUNCTION ephy_glade_widget_new ##### -->
-<para>
-
-</para>
-
-@file: 
-@widget_name: 
-@root: 
-@data: 
-@domain: 
-@Returns: 
-
-
diff --git a/doc/reference/tmpl/ephy-node-db.sgml b/doc/reference/tmpl/ephy-node-db.sgml
index 3cffa4c64..f79f64142 100644
--- a/doc/reference/tmpl/ephy-node-db.sgml
+++ b/doc/reference/tmpl/ephy-node-db.sgml
@@ -28,104 +28,3 @@ and restored using ephy_node_db_load_from_file().
 
 </para>
 
-<!-- ##### STRUCT EphyNodeDb ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG EphyNodeDb:immutable ##### -->
-<para>
-%TRUE if no #EphyNode<!-- -->s can be added, removed or modified from this
-#EphyNodeDb
-</para>
-
-<!-- ##### ARG EphyNodeDb:name ##### -->
-<para>
-A string identifier unique to this #EphyNodeDb
-</para>
-
-<!-- ##### FUNCTION ephy_node_db_get_by_name ##### -->
-<para>
-
-</para>
-
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION ephy_node_db_new ##### -->
-<para>
-
-</para>
-
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION ephy_node_db_load_from_file ##### -->
-<para>
-
-</para>
-
-@db: 
-@xml_file: 
-@xml_root: 
-@xml_version: 
-@Returns: 
-
-
-<!-- ##### FUNCTION ephy_node_db_write_to_xml_safe ##### -->
-<para>
-
-</para>
-
-@db: 
-@filename: 
-@root: 
-@version: 
-@comment: 
-@node: 
-@Varargs: 
-@Returns: 
-
-
-<!-- ##### FUNCTION ephy_node_db_get_name ##### -->
-<para>
-
-</para>
-
-@db: 
-@Returns: 
-
-
-<!-- ##### FUNCTION ephy_node_db_is_immutable ##### -->
-<para>
-
-</para>
-
-@db: 
-@Returns: 
-
-
-<!-- ##### FUNCTION ephy_node_db_set_immutable ##### -->
-<para>
-
-</para>
-
-@db: 
-@immutable: 
-
-
-<!-- ##### FUNCTION ephy_node_db_get_node_from_id ##### -->
-<para>
-
-</para>
-
-@db: 
-@id: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@Param2: 
-
-
diff --git a/doc/reference/tmpl/epiphany-unused.sgml b/doc/reference/tmpl/epiphany-unused.sgml
index 148d731f4..3ef56148b 100644
--- a/doc/reference/tmpl/epiphany-unused.sgml
+++ b/doc/reference/tmpl/epiphany-unused.sgml
@@ -108,6 +108,25 @@ mozilla-embed-event
 </para>
 
 
+<!-- ##### STRUCT EphyNodeDb ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyNodeDb:immutable ##### -->
+<para>
+%TRUE if no #EphyNode<!-- -->s can be added, removed or modified from this
+#EphyNodeDb
+</para>
+
+
+<!-- ##### ARG EphyNodeDb:name ##### -->
+<para>
+A string identifier unique to this #EphyNodeDb
+</para>
+
+
 <!-- ##### ARG EphyTab:blocked-popup-count ##### -->
 <para>
 
@@ -169,6 +188,93 @@ mozilla-embed-event
 
 @Returns: 
 
+<!-- ##### FUNCTION ephy_glade_widget_new ##### -->
+<para>
+
+</para>
+
+@file: 
+@widget_name: 
+@root: 
+@data: 
+@domain: 
+@Returns: 
+
+<!-- ##### FUNCTION ephy_node_db_get_by_name ##### -->
+<para>
+
+</para>
+
+@name: 
+@Returns: 
+
+<!-- ##### FUNCTION ephy_node_db_get_name ##### -->
+<para>
+
+</para>
+
+@db: 
+@Returns: 
+
+<!-- ##### FUNCTION ephy_node_db_get_node_from_id ##### -->
+<para>
+
+</para>
+
+@db: 
+@id: 
+@Returns: 
+@Param2: 
+
+<!-- ##### FUNCTION ephy_node_db_is_immutable ##### -->
+<para>
+
+</para>
+
+@db: 
+@Returns: 
+
+<!-- ##### FUNCTION ephy_node_db_load_from_file ##### -->
+<para>
+
+</para>
+
+@db: 
+@xml_file: 
+@xml_root: 
+@xml_version: 
+@Returns: 
+
+<!-- ##### FUNCTION ephy_node_db_new ##### -->
+<para>
+
+</para>
+
+@name: 
+@Returns: 
+
+<!-- ##### FUNCTION ephy_node_db_set_immutable ##### -->
+<para>
+
+</para>
+
+@db: 
+@immutable: 
+
+<!-- ##### FUNCTION ephy_node_db_write_to_xml_safe ##### -->
+<para>
+
+</para>
+
+@db: 
+@filename: 
+@root: 
+@version: 
+@comment: 
+@node: 
+@Varargs: 
+@Returns: 
+
 <!-- ##### FUNCTION ephy_shell_delete_on_exit ##### -->
 <para>