5 files changed, 95 insertions, 15 deletions
diff --git a/doc/reference/shell/tmpl/e-shell-content.sgml b/doc/reference/shell/tmpl/e-shell-content.sgml
index b4803b93b0..3f53314db7 100644
--- a/doc/reference/shell/tmpl/e-shell-content.sgml
+++ b/doc/reference/shell/tmpl/e-shell-content.sgml
@@ -37,13 +37,13 @@ EShellContent
 @Returns: 
 
 
-<!-- ##### FUNCTION e_shell_content_get_searchbar ##### -->
+<!-- ##### FUNCTION e_shell_content_set_searchbar ##### -->
 <para>
 
 </para>
 
 @shell_content: 
-@Returns: 
+@searchbar: 
 
 
 <!-- ##### FUNCTION e_shell_content_check_state ##### -->
@@ -82,15 +82,6 @@ EShellContent
 @view_id: 
 
 
-<!-- ##### FUNCTION e_shell_content_get_search_name ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@Returns: 
-
-
 <!-- ##### FUNCTION e_shell_content_run_advanced_search_dialog ##### -->
 <para>
 
diff --git a/doc/reference/shell/tmpl/e-shell-searchbar.sgml b/doc/reference/shell/tmpl/e-shell-searchbar.sgml
index 71f8894845..4817ccee6b 100644
--- a/doc/reference/shell/tmpl/e-shell-searchbar.sgml
+++ b/doc/reference/shell/tmpl/e-shell-searchbar.sgml
@@ -23,6 +23,11 @@ EShellSearchbar
 </para>
 
 
+<!-- ##### ARG EShellSearchbar:express-mode ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG EShellSearchbar:filter-combo-box ##### -->
 <para>
 
@@ -33,7 +38,7 @@ EShellSearchbar
 
 </para>
 
-<!-- ##### ARG EShellSearchbar:label-visible ##### -->
+<!-- ##### ARG EShellSearchbar:labels-visible ##### -->
 <para>
 
 </para>
@@ -96,6 +101,24 @@ EShellSearchbar
 @Returns: 
 
 
+<!-- ##### FUNCTION e_shell_searchbar_get_express_mode ##### -->
+<para>
+
+</para>
+
+@searchbar: 
+@Returns: 
+
+
+<!-- ##### FUNCTION e_shell_searchbar_set_express_mode ##### -->
+<para>
+
+</para>
+
+@searchbar: 
+@express_mode: 
+
+
 <!-- ##### FUNCTION e_shell_searchbar_get_filter_combo_box ##### -->
 <para>
 
@@ -123,7 +146,7 @@ EShellSearchbar
 @filter_visible: 
 
 
-<!-- ##### FUNCTION e_shell_searchbar_get_label_visible ##### -->
+<!-- ##### FUNCTION e_shell_searchbar_get_labels_visible ##### -->
 <para>
 
 </para>
@@ -132,13 +155,13 @@ EShellSearchbar
 @Returns: 
 
 
-<!-- ##### FUNCTION e_shell_searchbar_set_label_visible ##### -->
+<!-- ##### FUNCTION e_shell_searchbar_set_labels_visible ##### -->
 <para>
 
 </para>
 
 @searchbar: 
-@label_visible: 
+@labels_visible: 
 
 
 <!-- ##### FUNCTION e_shell_searchbar_get_search_hint ##### -->
diff --git a/doc/reference/shell/tmpl/e-shell-view.sgml b/doc/reference/shell/tmpl/e-shell-view.sgml
index 03d8830fdb..5efb4d7921 100644
--- a/doc/reference/shell/tmpl/e-shell-view.sgml
+++ b/doc/reference/shell/tmpl/e-shell-view.sgml
@@ -133,6 +133,8 @@ EShellView
 @new_shell_content: 
 @new_shell_sidebar: 
 @new_shell_taskbar: 
+@construct_searchbar: 
+@get_search_name: 
 @toggled: 
 @clear_search: 
 @custom_search: 
@@ -220,6 +222,24 @@ EShellView
 @page_num: 
 
 
+<!-- ##### FUNCTION e_shell_view_get_searchbar ##### -->
+<para>
+
+</para>
+
+@shell_view: 
+@Returns: 
+
+
+<!-- ##### FUNCTION e_shell_view_get_search_name ##### -->
+<para>
+
+</para>
+
+@shell_view: 
+@Returns: 
+
+
 <!-- ##### FUNCTION e_shell_view_get_search_rule ##### -->
 <para>
 
diff --git a/doc/reference/shell/tmpl/e-util.sgml b/doc/reference/shell/tmpl/e-util.sgml
index 72bf737586..82be9d041b 100644
--- a/doc/reference/shell/tmpl/e-util.sgml
+++ b/doc/reference/shell/tmpl/e-util.sgml
@@ -25,6 +25,14 @@ Miscellaneous Utilities
 @Returns: 
 
 
+<!-- ##### FUNCTION e_get_gnome2_user_dir ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
 <!-- ##### FUNCTION e_get_accels_filename ##### -->
 <para>
 
diff --git a/doc/reference/shell/tmpl/eshell-unused.sgml b/doc/reference/shell/tmpl/eshell-unused.sgml
index e69de29bb2..93f3a149fa 100644
--- a/doc/reference/shell/tmpl/eshell-unused.sgml
+++ b/doc/reference/shell/tmpl/eshell-unused.sgml
@@ -0,0 +1,38 @@
+<!-- ##### ARG EShellSearchbar:label-visible ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION e_shell_content_get_search_name ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_content_get_searchbar ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_searchbar_get_label_visible ##### -->
+<para>
+
+</para>
+
+@searchbar: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_searchbar_set_label_visible ##### -->
+<para>
+
+</para>
+
+@searchbar: 
+@label_visible: 
+