5 files changed, 21 insertions, 42 deletions
diff --git a/doc/reference/shell/Makefile.am b/doc/reference/shell/Makefile.am
index 97322a1c40..931db22b27 100644
--- a/doc/reference/shell/Makefile.am
+++ b/doc/reference/shell/Makefile.am
@@ -18,8 +18,7 @@ SCANGOBJ_OPTIONS=
 SCAN_OPTIONS=
 
 # Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS=--sgml-mode --output-format=xml
+MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=e
 
 # Extra options to supply to gtkdoc-mktmpl
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
@@ -77,7 +76,6 @@ EXTRA_DIST +=
 # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
 #DISTCLEANFILES +=
 
-# Comment this out if you want your docs-status tested during 'make check'
 #TESTS = $(GTKDOC_CHECK)
 
 -include $(top_srcdir)/git.mk
diff --git a/doc/reference/shell/eshell-docs.sgml b/doc/reference/shell/eshell-docs.sgml
index 2556a58320..6101932139 100644
--- a/doc/reference/shell/eshell-docs.sgml
+++ b/doc/reference/shell/eshell-docs.sgml
@@ -37,6 +37,7 @@
     <xi:include href="xml/e-html-utils.xml"/>
     <xi:include href="xml/e-icon-factory.xml"/>
     <xi:include href="xml/e-logger.xml"/>
+    <xi:include href="xml/e-poolv.xml"/>
     <xi:include href="xml/e-print.xml"/>
     <xi:include href="xml/e-selection.xml"/>
     <xi:include href="xml/e-signature.xml"/>
diff --git a/doc/reference/shell/eshell-sections.txt b/doc/reference/shell/eshell-sections.txt
index c176e23ee3..7ee56ab6bf 100644
--- a/doc/reference/shell/eshell-sections.txt
+++ b/doc/reference/shell/eshell-sections.txt
@@ -546,6 +546,16 @@ EModulePrivate
 </SECTION>
 
 <SECTION>
+<FILE>e-poolv</FILE>
+<TITLE>EPoolv</TITLE>
+EPoolv
+e_poolv_new
+e_poolv_set
+e_poolv_get
+e_poolv_destroy
+</SECTION>
+
+<SECTION>
 <FILE>e-print</FILE>
 <TITLE>Printing</TITLE>
 e_print_operation_new
@@ -681,11 +691,8 @@ e_file_lock_exists
 e_util_guess_mime_type
 e_util_get_category_filter_options
 e_charset_add_radio_actions
-e_folder_map_local_folders
 e_file_replace_contents_async
 e_file_replace_contents_finish
-e_fsutils_usage
-e_fsutils_avail
 e_mktemp
 e_mkstemp
 e_mkdtemp
diff --git a/doc/reference/shell/tmpl/e-util.sgml b/doc/reference/shell/tmpl/e-util.sgml
index e140452d0b..1d17258128 100644
--- a/doc/reference/shell/tmpl/e-util.sgml
+++ b/doc/reference/shell/tmpl/e-util.sgml
@@ -29,6 +29,15 @@ Miscellaneous Utilities
 @Returns: 
 
 
+<!-- ##### FUNCTION e_get_gnome2_user_dir ##### -->
+<para>
+
+</para>
+
+@void: 
+@Returns: 
+
+
 <!-- ##### FUNCTION e_get_accels_filename ##### -->
 <para>
 
@@ -348,16 +357,6 @@ Miscellaneous Utilities
 @Returns: 
 
 
-<!-- ##### FUNCTION e_folder_map_local_folders ##### -->
-<para>
-
-</para>
-
-@local_dir: 
-@type: 
-@Returns: 
-
-
 <!-- ##### FUNCTION e_file_replace_contents_async ##### -->
 <para>
 
@@ -386,24 +385,6 @@ Miscellaneous Utilities
 @Returns: 
 
 
-<!-- ##### FUNCTION e_fsutils_usage ##### -->
-<para>
-
-</para>
-
-@path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_fsutils_avail ##### -->
-<para>
-
-</para>
-
-@path: 
-@Returns: 
-
-
 <!-- ##### FUNCTION e_mktemp ##### -->
 <para>
 
diff --git a/doc/reference/shell/tmpl/eshell-unused.sgml b/doc/reference/shell/tmpl/eshell-unused.sgml
index 1cb81172df..93f3a149fa 100644
--- a/doc/reference/shell/tmpl/eshell-unused.sgml
+++ b/doc/reference/shell/tmpl/eshell-unused.sgml
@@ -4,14 +4,6 @@
 </para>
 
 
-<!-- ##### FUNCTION e_get_gnome2_user_dir ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
 <!-- ##### FUNCTION e_shell_content_get_search_name ##### -->
 <para>