Release 1.3.0Release130

8 files changed, 221 insertions, 216 deletions

diff --git a/doc/reference/tmpl/ephy-command-manager.sgml b/doc/reference/tmpl/ephy-command-manager.sgml
index 060d41615..19b7140ad 100644
--- a/doc/reference/tmpl/ephy-command-manager.sgml
+++ b/doc/reference/tmpl/ephy-command-manager.sgml
@@ -73,6 +73,14 @@ text entry)</para></listitem>
 </para>
 
 
+<!-- ##### SIGNAL EphyCommandManager::command-changed ##### -->
+<para>
+
+</para>
+
+@ephycommandmanager: the object which received the signal.
+@arg1: 
+
 <!-- ##### STRUCT EphyCommandManagerIface ##### -->
 <para>
 
@@ -102,11 +110,3 @@ text entry)</para></listitem>
 @Returns: 
 
 
-<!-- ##### SIGNAL EphyCommandManager::command-changed ##### -->
-<para>
-
-</para>
-
-@ephycommandmanager: the object which received the signal.
-@arg1: 
-
diff --git a/doc/reference/tmpl/ephy-embed-persist.sgml b/doc/reference/tmpl/ephy-embed-persist.sgml
index e280a76da..f16d3be1b 100644
--- a/doc/reference/tmpl/ephy-embed-persist.sgml
+++ b/doc/reference/tmpl/ephy-embed-persist.sgml
@@ -254,57 +254,3 @@ Determines how the #EphyEmbedPersist should act.
 @Returns: 
 
 
-<!-- ##### SIGNAL EphyEmbedPersist::cancelled ##### -->
-<para>
-
-</para>
-
-@ephyembedpersist: the object which received the signal.
-
-<!-- ##### SIGNAL EphyEmbedPersist::completed ##### -->
-<para>
-
-</para>
-
-@ephyembedpersist: the object which received the signal.
-
-<!-- ##### ARG EphyEmbedPersist:dest ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG EphyEmbedPersist:embed ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG EphyEmbedPersist:filechooser-parent ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG EphyEmbedPersist:filechooser-title ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG EphyEmbedPersist:flags ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG EphyEmbedPersist:max-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG EphyEmbedPersist:persist-key ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG EphyEmbedPersist:source ##### -->
-<para>
-
-</para>
-
diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index 0deb4abec..92c329f48 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -42,6 +42,83 @@ be done by casting).
 </para>
 
 
+<!-- ##### SIGNAL EphyEmbed::ge-context-menu ##### -->
+<para>
+
+</para>
+
+@ephyembed: the object which received the signal.
+@arg1: 
+@Returns: 
+
+<!-- ##### SIGNAL EphyEmbed::ge-dom-mouse-click ##### -->
+<para>
+
+</para>
+
+@ephyembed: the object which received the signal.
+@arg1: 
+@Returns: 
+
+<!-- ##### SIGNAL EphyEmbed::ge-dom-mouse-down ##### -->
+<para>
+
+</para>
+
+@ephyembed: the object which received the signal.
+@arg1: 
+@Returns: 
+
+<!-- ##### SIGNAL EphyEmbed::ge-favicon ##### -->
+<para>
+
+</para>
+
+@ephyembed: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL EphyEmbed::ge-location ##### -->
+<para>
+
+</para>
+
+@ephyembed: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL EphyEmbed::ge-net-state ##### -->
+<para>
+
+</para>
+
+@ephyembed: the object which received the signal.
+@arg1: 
+@arg2: 
+
+<!-- ##### SIGNAL EphyEmbed::ge-new-window ##### -->
+<para>
+
+</para>
+
+@ephyembed: the object which received the signal.
+@arg1: 
+@arg2: 
+
+<!-- ##### SIGNAL EphyEmbed::ge-security-change ##### -->
+<para>
+
+</para>
+
+@ephyembed: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL EphyEmbed::ge-zoom-change ##### -->
+<para>
+
+</para>
+
+@ephyembed: the object which received the signal.
+@arg1: 
+
 <!-- ##### STRUCT EphyEmbedIface ##### -->
 <para>
 
@@ -81,8 +158,9 @@ be done by casting).
 @get_zoom: 
 @find_set_properties: 
 @find_next: 
+@get_encoding: 
+@has_automatic_encoding: 
 @set_encoding: 
-@get_encoding_info: 
 @print: 
 @print_preview_close: 
 @print_preview_n_pages: 
@@ -374,15 +452,6 @@ invalid SSL certificate will have an #EmbedSecurityLevel of %STATE_IS_BROKEN.
 @encoding: 
 
 
-<!-- ##### FUNCTION ephy_embed_get_encoding_info ##### -->
-<para>
-
-</para>
-
-@embed: 
-@Returns: 
-
-
 <!-- ##### FUNCTION ephy_embed_print ##### -->
 <para>
 
@@ -436,80 +505,3 @@ invalid SSL certificate will have an #EmbedSecurityLevel of %STATE_IS_BROKEN.
 @Returns: 
 
 
-<!-- ##### SIGNAL EphyEmbed::ge-context-menu ##### -->
-<para>
-
-</para>
-
-@ephyembed: the object which received the signal.
-@arg1: 
-@Returns: 
-
-<!-- ##### SIGNAL EphyEmbed::ge-dom-mouse-click ##### -->
-<para>
-
-</para>
-
-@ephyembed: the object which received the signal.
-@arg1: 
-@Returns: 
-
-<!-- ##### SIGNAL EphyEmbed::ge-dom-mouse-down ##### -->
-<para>
-
-</para>
-
-@ephyembed: the object which received the signal.
-@arg1: 
-@Returns: 
-
-<!-- ##### SIGNAL EphyEmbed::ge-favicon ##### -->
-<para>
-
-</para>
-
-@ephyembed: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL EphyEmbed::ge-location ##### -->
-<para>
-
-</para>
-
-@ephyembed: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL EphyEmbed::ge-net-state ##### -->
-<para>
-
-</para>
-
-@ephyembed: the object which received the signal.
-@arg1: 
-@arg2: 
-
-<!-- ##### SIGNAL EphyEmbed::ge-new-window ##### -->
-<para>
-
-</para>
-
-@ephyembed: the object which received the signal.
-@arg1: 
-@arg2: 
-
-<!-- ##### SIGNAL EphyEmbed::ge-security-change ##### -->
-<para>
-
-</para>
-
-@ephyembed: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL EphyEmbed::ge-zoom-change ##### -->
-<para>
-
-</para>
-
-@ephyembed: the object which received the signal.
-@arg1: 
-
diff --git a/doc/reference/tmpl/ephy-glade.sgml b/doc/reference/tmpl/ephy-glade.sgml
index e8bb2eb2e..faa726514 100644
--- a/doc/reference/tmpl/ephy-glade.sgml
+++ b/doc/reference/tmpl/ephy-glade.sgml
@@ -4,7 +4,6 @@ EphyGlade
 <!-- ##### SECTION Short_Description ##### -->
 Load a glade XML definition
 
-
 <!-- ##### SECTION Long_Description ##### -->
 <para>
 Epiphany has its own convenience wrapper around glade_xml_new() which will
@@ -16,13 +15,11 @@ After retrieving a #GladeXML object from ephy_glade_widget_new(), regular
 #GladeXML functions can be called on that object.
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### FUNCTION ephy_glade_widget_new ##### -->
 <para>
 
diff --git a/doc/reference/tmpl/ephy-node-db.sgml b/doc/reference/tmpl/ephy-node-db.sgml
index ff753f80f..3cffa4c64 100644
--- a/doc/reference/tmpl/ephy-node-db.sgml
+++ b/doc/reference/tmpl/ephy-node-db.sgml
@@ -34,6 +34,17 @@ and restored using ephy_node_db_load_from_file().
 </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>
 
@@ -118,14 +129,3 @@ and restored using ephy_node_db_load_from_file().
 @Param2: 
 
 
-<!-- ##### 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>
-
diff --git a/doc/reference/tmpl/ephy-tab.sgml b/doc/reference/tmpl/ephy-tab.sgml
index 541aeef5f..aa6599bfa 100644
--- a/doc/reference/tmpl/ephy-tab.sgml
+++ b/doc/reference/tmpl/ephy-tab.sgml
@@ -24,60 +24,65 @@ To retrieve an #EphyTab's parent #EphyWindow, use gtk_widget_get_toplevel().
 </para>
 
 
-<!-- ##### FUNCTION ephy_tab_new ##### -->
+<!-- ##### ARG EphyTab:address ##### -->
 <para>
 
 </para>
 
-@Returns: 
+<!-- ##### ARG EphyTab:icon ##### -->
+<para>
 
+</para>
 
-<!-- ##### FUNCTION ephy_tab_get_embed ##### -->
+<!-- ##### ARG EphyTab:load-progress ##### -->
 <para>
 
 </para>
 
-@tab: 
-@Returns: 
+<!-- ##### ARG EphyTab:load-status ##### -->
+<para>
 
+</para>
 
-<!-- ##### FUNCTION ephy_tab_for_embed ##### -->
+<!-- ##### ARG EphyTab:message ##### -->
 <para>
 
 </para>
 
-@embed: 
-@Returns: 
+<!-- ##### ARG EphyTab:navigation ##### -->
+<para>
 
+</para>
 
-<!-- ##### FUNCTION ephy_tab_get_icon_address ##### -->
+<!-- ##### ARG EphyTab:security-level ##### -->
 <para>
 
 </para>
 
-@tab: 
-@Returns: 
+<!-- ##### ARG EphyTab:title ##### -->
+<para>
 
+</para>
 
-<!-- ##### FUNCTION ephy_tab_get_location ##### -->
+<!-- ##### ARG EphyTab:visible ##### -->
 <para>
 
 </para>
 
-@tab: 
-@Returns: 
+<!-- ##### ARG EphyTab:zoom ##### -->
+<para>
 
+</para>
 
-<!-- ##### FUNCTION ephy_tab_get_security_level ##### -->
+<!-- ##### FUNCTION ephy_tab_new ##### -->
 <para>
 
 </para>
 
-@tab: 
 @Returns: 
 
 
-<!-- ##### FUNCTION ephy_tab_get_title ##### -->
+<!-- ##### FUNCTION ephy_tab_get_embed ##### -->
 <para>
 
 </para>
@@ -86,16 +91,16 @@ To retrieve an #EphyTab's parent #EphyWindow, use gtk_widget_get_toplevel().
 @Returns: 
 
 
-<!-- ##### FUNCTION ephy_tab_get_zoom ##### -->
+<!-- ##### FUNCTION ephy_tab_for_embed ##### -->
 <para>
 
 </para>
 
-@tab: 
+@embed: 
 @Returns: 
 
 
-<!-- ##### FUNCTION ephy_tab_get_load_status ##### -->
+<!-- ##### FUNCTION ephy_tab_get_icon_address ##### -->
 <para>
 
 </para>
@@ -104,7 +109,7 @@ To retrieve an #EphyTab's parent #EphyWindow, use gtk_widget_get_toplevel().
 @Returns: 
 
 
-<!-- ##### FUNCTION ephy_tab_get_load_percent ##### -->
+<!-- ##### FUNCTION ephy_tab_get_location ##### -->
 <para>
 
 </para>
@@ -113,7 +118,7 @@ To retrieve an #EphyTab's parent #EphyWindow, use gtk_widget_get_toplevel().
 @Returns: 
 
 
-<!-- ##### FUNCTION ephy_tab_get_link_message ##### -->
+<!-- ##### FUNCTION ephy_tab_get_security_level ##### -->
 <para>
 
 </para>
@@ -122,7 +127,7 @@ To retrieve an #EphyTab's parent #EphyWindow, use gtk_widget_get_toplevel().
 @Returns: 
 
 
-<!-- ##### FUNCTION ephy_tab_get_status_message ##### -->
+<!-- ##### FUNCTION ephy_tab_get_title ##### -->
 <para>
 
 </para>
@@ -131,53 +136,48 @@ To retrieve an #EphyTab's parent #EphyWindow, use gtk_widget_get_toplevel().
 @Returns: 
 
 
-<!-- ##### ARG EphyTab:address ##### -->
+<!-- ##### FUNCTION ephy_tab_get_zoom ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG EphyTab:icon ##### -->
-<para>
+@tab: 
+@Returns: 
 
-</para>
 
-<!-- ##### ARG EphyTab:load-progress ##### -->
+<!-- ##### FUNCTION ephy_tab_get_load_status ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG EphyTab:load-status ##### -->
-<para>
+@tab: 
+@Returns: 
 
-</para>
 
-<!-- ##### ARG EphyTab:message ##### -->
+<!-- ##### FUNCTION ephy_tab_get_load_percent ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG EphyTab:navigation ##### -->
-<para>
+@tab: 
+@Returns: 
 
-</para>
 
-<!-- ##### ARG EphyTab:security-level ##### -->
+<!-- ##### FUNCTION ephy_tab_get_link_message ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG EphyTab:title ##### -->
-<para>
+@tab: 
+@Returns: 
 
-</para>
 
-<!-- ##### ARG EphyTab:visible ##### -->
+<!-- ##### FUNCTION ephy_tab_get_status_message ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG EphyTab:zoom ##### -->
-<para>
+@tab: 
+@Returns: 
 
-</para>
 
diff --git a/doc/reference/tmpl/ephy-window.sgml b/doc/reference/tmpl/ephy-window.sgml
index 391abd920..b831ebbe8 100644
--- a/doc/reference/tmpl/ephy-window.sgml
+++ b/doc/reference/tmpl/ephy-window.sgml
@@ -35,6 +35,16 @@ These are restricted to ephy_window_set_zoom() and ephy_window_load_url().
 
 @ui_merge: The #GtkUIManager this window uses to merge user interfaces
 
+<!-- ##### ARG EphyWindow:active-tab ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG EphyWindow:chrome ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION ephy_window_new ##### -->
 <para>
 
@@ -186,13 +196,3 @@ These are restricted to ephy_window_set_zoom() and ephy_window_load_url().
 @url: 
 
 
-<!-- ##### ARG EphyWindow:active-tab ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG EphyWindow:chrome ##### -->
-<para>
-
-</para>
-
diff --git a/doc/reference/tmpl/epiphany-unused.sgml b/doc/reference/tmpl/epiphany-unused.sgml
index 2932d9274..548bd69cf 100644
--- a/doc/reference/tmpl/epiphany-unused.sgml
+++ b/doc/reference/tmpl/epiphany-unused.sgml
@@ -45,6 +45,76 @@ mozilla-embed-event
 
 @ephyembed: the object which received the signal.
 
+<!-- ##### SIGNAL EphyEmbedPersist::cancelled ##### -->
+<para>
+
+</para>
+
+@ephyembedpersist: the object which received the signal.
+
+<!-- ##### SIGNAL EphyEmbedPersist::completed ##### -->
+<para>
+
+</para>
+
+@ephyembedpersist: the object which received the signal.
+
+<!-- ##### ARG EphyEmbedPersist:dest ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyEmbedPersist:embed ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyEmbedPersist:filechooser-parent ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyEmbedPersist:filechooser-title ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyEmbedPersist:flags ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyEmbedPersist:max-size ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyEmbedPersist:persist-key ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyEmbedPersist:source ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION ephy_embed_get_encoding_info ##### -->
+<para>
+
+</para>
+
+@embed: 
+@Returns: 
+
 <!-- ##### FUNCTION ephy_embed_get_type ##### -->
 <para>