Load/unload extensions based on GConf key

	/apps/epiphany/general/active_extensions.

	Update documentation a bit (i.e., make sure it actually builds).

6 files changed, 82 insertions, 12 deletions

diff --git a/doc/reference/tmpl/ephy-embed-factory.sgml b/doc/reference/tmpl/ephy-embed-factory.sgml
index f80295416..556730839 100644
--- a/doc/reference/tmpl/ephy-embed-factory.sgml
+++ b/doc/reference/tmpl/ephy-embed-factory.sgml
@@ -25,7 +25,9 @@ To create a new instance of an #EphyEmbed, #EphyEmbedPersist or
 
 </para>
 
-@object_id: 
+@type: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@object_id: 
 
 
diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index 8688721b1..da9a9e933 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -146,6 +146,14 @@ be done by casting).
 @: 
 @:
 @: 
+@:
+@: 
+@:
+@: 
+@:
+@: 
+@:
+@: 
 @: 
 
 <!-- ##### SIGNAL EphyEmbed::ge-security-change ##### -->
diff --git a/doc/reference/tmpl/ephy-extensions-manager.sgml b/doc/reference/tmpl/ephy-extensions-manager.sgml
new file mode 100644
index 000000000..418123132
--- /dev/null
+++ b/doc/reference/tmpl/ephy-extensions-manager.sgml
@@ -0,0 +1,63 @@
+<!-- ##### SECTION Title ##### -->
+EphyExtensionsManager
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### FUNCTION ephy_extensions_manager_new ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
+<!-- ##### FUNCTION ephy_extensions_manager_load ##### -->
+<para>
+
+</para>
+
+@manager: 
+@filename: 
+<!-- # Unused Parameters # -->
+@Returns: 
+
+
+<!-- ##### FUNCTION ephy_extensions_manager_unload ##### -->
+<para>
+
+</para>
+
+@manager: 
+@filename: 
+
+
+<!-- ##### FUNCTION ephy_extensions_manager_load_dir ##### -->
+<para>
+
+</para>
+
+@manager: 
+@path: 
+
+
+<!-- ##### FUNCTION ephy_extensions_manager_add ##### -->
+<para>
+
+</para>
+
+@manager: 
+@type: 
+@Returns: 
+
+
diff --git a/doc/reference/tmpl/ephy-shell.sgml b/doc/reference/tmpl/ephy-shell.sgml
index 6c9e8b68d..570c6a038 100644
--- a/doc/reference/tmpl/ephy-shell.sgml
+++ b/doc/reference/tmpl/ephy-shell.sgml
@@ -48,7 +48,6 @@ ephy-shell
 @EPHY_SHELL_STARTUP_SESSION: 
 @EPHY_SHELL_STARTUP_IMPORT_BOOKMARKS: 
 @EPHY_SHELL_STARTUP_ADD_BOOKMARK: 
-@EPHY_SHELL_STARTUP_SERVER: 
 
 <!-- ##### ENUM EphyNewTabFlags ##### -->
 <para>
@@ -94,15 +93,6 @@ ephy-shell
 @Returns: 
 
 
-<!-- ##### FUNCTION ephy_shell_get_active_window ##### -->
-<para>
-
-</para>
-
-@shell: 
-@Returns: 
-
-
 <!-- ##### FUNCTION ephy_shell_new_tab ##### -->
 <para>
 
diff --git a/doc/reference/tmpl/ephy-window.sgml b/doc/reference/tmpl/ephy-window.sgml
index b831ebbe8..218477bd6 100644
--- a/doc/reference/tmpl/ephy-window.sgml
+++ b/doc/reference/tmpl/ephy-window.sgml
@@ -33,7 +33,6 @@ These are restricted to ephy_window_set_zoom() and ephy_window_load_url().
 
 </para>
 
-@ui_merge: The #GtkUIManager this window uses to merge user interfaces
 
 <!-- ##### ARG EphyWindow:active-tab ##### -->
 <para>
diff --git a/doc/reference/tmpl/epiphany-unused.sgml b/doc/reference/tmpl/epiphany-unused.sgml
index aa9f02d89..1dfbb6967 100644
--- a/doc/reference/tmpl/epiphany-unused.sgml
+++ b/doc/reference/tmpl/epiphany-unused.sgml
@@ -154,6 +154,14 @@ mozilla-embed-event
 @path: 
 @gs: 
 
+<!-- ##### FUNCTION ephy_shell_get_active_window ##### -->
+<para>
+
+</para>
+
+@shell: 
+@Returns: 
+
 <!-- ##### FUNCTION ephy_tab_get_window ##### -->
 <para>