3 files changed, 68 insertions, 15 deletions
diff --git a/doc/reference/shell/eshell-sections.txt b/doc/reference/shell/eshell-sections.txt
index 908777cf4b..8e0d7723f9 100644
--- a/doc/reference/shell/eshell-sections.txt
+++ b/doc/reference/shell/eshell-sections.txt
@@ -3,13 +3,13 @@
 <TITLE>EShell</TITLE>
 EShell
 e_shell_get_default
-e_shell_list_modules
+e_shell_get_shell_modules
+e_shell_get_shell_windows
 e_shell_get_canonical_name
 e_shell_get_module_by_name
 e_shell_get_module_by_scheme
-e_shell_get_settings
-e_shell_create_window
-e_shell_get_focused_window
+e_shell_get_shell_settings
+e_shell_create_shell_window
 e_shell_handle_uri
 e_shell_send_receive
 e_shell_get_network_available
diff --git a/doc/reference/shell/tmpl/e-shell.sgml b/doc/reference/shell/tmpl/e-shell.sgml
index 350141a0e5..1b96f4a40d 100644
--- a/doc/reference/shell/tmpl/e-shell.sgml
+++ b/doc/reference/shell/tmpl/e-shell.sgml
@@ -78,7 +78,6 @@ EShell
 </para>
 
 @eshell: the object which received the signal.
-@arg1: 
 
 <!-- ##### ARG EShell:network-available ##### -->
 <para>
@@ -90,7 +89,7 @@ EShell
 
 </para>
 
-<!-- ##### ARG EShell:settings ##### -->
+<!-- ##### ARG EShell:shell-settings ##### -->
 <para>
 
 </para>
@@ -103,7 +102,7 @@ EShell
 @Returns: 
 
 
-<!-- ##### FUNCTION e_shell_list_modules ##### -->
+<!-- ##### FUNCTION e_shell_get_shell_modules ##### -->
 <para>
 
 </para>
@@ -112,17 +111,16 @@ EShell
 @Returns: 
 
 
-<!-- ##### FUNCTION e_shell_get_canonical_name ##### -->
+<!-- ##### FUNCTION e_shell_get_shell_windows ##### -->
 <para>
 
 </para>
 
 @shell: 
-@name: 
 @Returns: 
 
 
-<!-- ##### FUNCTION e_shell_get_module_by_name ##### -->
+<!-- ##### FUNCTION e_shell_get_canonical_name ##### -->
 <para>
 
 </para>
@@ -132,26 +130,27 @@ EShell
 @Returns: 
 
 
-<!-- ##### FUNCTION e_shell_get_module_by_scheme ##### -->
+<!-- ##### FUNCTION e_shell_get_module_by_name ##### -->
 <para>
 
 </para>
 
 @shell: 
-@scheme: 
+@name: 
 @Returns: 
 
 
-<!-- ##### FUNCTION e_shell_get_settings ##### -->
+<!-- ##### FUNCTION e_shell_get_module_by_scheme ##### -->
 <para>
 
 </para>
 
 @shell: 
+@scheme: 
 @Returns: 
 
 
-<!-- ##### FUNCTION e_shell_create_window ##### -->
+<!-- ##### FUNCTION e_shell_get_shell_settings ##### -->
 <para>
 
 </para>
@@ -160,7 +159,7 @@ EShell
 @Returns: 
 
 
-<!-- ##### FUNCTION e_shell_get_focused_window ##### -->
+<!-- ##### FUNCTION e_shell_create_shell_window ##### -->
 <para>
 
 </para>
diff --git a/doc/reference/shell/tmpl/eshell-unused.sgml b/doc/reference/shell/tmpl/eshell-unused.sgml
index cee15019d4..d8c74f0d7b 100644
--- a/doc/reference/shell/tmpl/eshell-unused.sgml
+++ b/doc/reference/shell/tmpl/eshell-unused.sgml
@@ -433,6 +433,12 @@ intelligent
 @minor: 
 @revision: 
 
+<!-- ##### ARG EShell:settings ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### ENUM EShellLineStatus ##### -->
 <para>
 
@@ -1731,6 +1737,22 @@ intelligent
 @revision: 
 @Returns: 
 
+<!-- ##### FUNCTION e_shell_create_window ##### -->
+<para>
+
+</para>
+
+@shell: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_get_focused_window ##### -->
+<para>
+
+</para>
+
+@shell: 
+@Returns: 
+
 <!-- ##### FUNCTION e_shell_get_line_status ##### -->
 <para>
 
@@ -1739,6 +1761,38 @@ intelligent
 @shell: 
 @Returns: 
 
+<!-- ##### FUNCTION e_shell_get_settings ##### -->
+<para>
+
+</para>
+
+@shell: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_list_modules ##### -->
+<para>
+
+</para>
+
+@shell: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_list_shell_modules ##### -->
+<para>
+
+</para>
+
+@shell: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_list_shell_windows ##### -->
+<para>
+
+</para>
+
+@shell: 
+@Returns: 
+
 <!-- ##### FUNCTION e_shell_marshal_BOOLEAN__STRING ##### -->
 <para>