9 files changed, 11 insertions, 8 deletions
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 7e04e1253d..bfa5808884 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = evolution-util libeshell
+SUBDIRS = evolution-util evolution-shell
 
 -include $(top_srcdir)/git.mk
diff --git a/doc/reference/libeshell/Makefile.am b/doc/reference/evolution-shell/Makefile.am
index 90260b593c..5ff5a0af32 100644
--- a/doc/reference/libeshell/Makefile.am
+++ b/doc/reference/evolution-shell/Makefile.am
@@ -1,5 +1,5 @@
 # The name of the module.
-DOC_MODULE=libeshell
+DOC_MODULE=evolution-shell
 
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
@@ -28,7 +28,7 @@ GTKDOC_CFLAGS= \
 
 GTKDOC_LIBS=								\
 	$(top_builddir)/libemail-engine/libemail-engine.la		\
-	$(top_builddir)/shell/libeshell.la				\
+	$(top_builddir)/shell/libevolution-shell.la			\
 	$(top_builddir)/e-util/libevolution-util.la			\
 	$(EVOLUTION_DATA_SERVER_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)						\
diff --git a/doc/reference/libeshell/libeshell-docs.sgml b/doc/reference/evolution-shell/evolution-shell-docs.sgml
index 992e0b25b1..ba1305eaf5 100644
--- a/doc/reference/libeshell/libeshell-docs.sgml
+++ b/doc/reference/evolution-shell/evolution-shell-docs.sgml
@@ -1,12 +1,15 @@
 <?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+]>
+<book id="index">
   <bookinfo>
     <title>Evolution Shell Reference Manual</title>
     <releaseinfo>
       The latest version of this documentation can be found on-line at
-      <ulink role="online-location" url="http://library.gnome.org/devel/libeshell/">http://library.gnome.org/devel/libeshell/</ulink>.
+      <ulink role="online-location" url="http://developer.gnome.org/evolution-shell/">http://developer.gnome.org/evolution-shell/</ulink>.
     </releaseinfo>
   </bookinfo>
 
@@ -30,7 +33,7 @@
     <xi:include href="xml/action-groups.xml"/>
   </chapter>
 
-  <chapter>
+  <chapter id="object-tree">
     <title>Object Hierarchy</title>
     <xi:include href="xml/tree_index.sgml"/>
   </chapter>
diff --git a/doc/reference/libeshell/libeshell-overrides.txt b/doc/reference/evolution-shell/evolution-shell-overrides.txt
index e69de29bb2..e69de29bb2 100644
--- a/doc/reference/libeshell/libeshell-overrides.txt
+++ b/doc/reference/evolution-shell/evolution-shell-overrides.txt
diff --git a/doc/reference/libeshell/libeshell-sections.txt b/doc/reference/evolution-shell/evolution-shell-sections.txt
index 5798533fd6..5798533fd6 100644
--- a/doc/reference/libeshell/libeshell-sections.txt
+++ b/doc/reference/evolution-shell/evolution-shell-sections.txt
diff --git a/doc/reference/libeshell/libeshell.types b/doc/reference/evolution-shell/evolution-shell.types
index 2bc9a71963..2bc9a71963 100644
--- a/doc/reference/libeshell/libeshell.types
+++ b/doc/reference/evolution-shell/evolution-shell.types
diff --git a/doc/reference/libeshell/tmpl/e-mail-account-manager.sgml b/doc/reference/evolution-shell/tmpl/e-mail-account-manager.sgml
index 49fe04bdf2..49fe04bdf2 100644
--- a/doc/reference/libeshell/tmpl/e-mail-account-manager.sgml
+++ b/doc/reference/evolution-shell/tmpl/e-mail-account-manager.sgml
diff --git a/doc/reference/libeshell/tmpl/e-mail-account-tree-view.sgml b/doc/reference/evolution-shell/tmpl/e-mail-account-tree-view.sgml
index eaee2f12c5..eaee2f12c5 100644
--- a/doc/reference/libeshell/tmpl/e-mail-account-tree-view.sgml
+++ b/doc/reference/evolution-shell/tmpl/e-mail-account-tree-view.sgml
diff --git a/doc/reference/libeshell/tmpl/e-mail-identity-combo-box.sgml b/doc/reference/evolution-shell/tmpl/e-mail-identity-combo-box.sgml
index fec8130b21..fec8130b21 100644
--- a/doc/reference/libeshell/tmpl/e-mail-identity-combo-box.sgml
+++ b/doc/reference/evolution-shell/tmpl/e-mail-identity-combo-box.sgml