7 files changed, 12 insertions, 11 deletions
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 806e1b0d83..7e04e1253d 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = libeutil libeshell
+SUBDIRS = evolution-util libeshell
 
 -include $(top_srcdir)/git.mk
diff --git a/doc/reference/libeutil/Makefile.am b/doc/reference/evolution-util/Makefile.am
index 411f0c8b44..a7055a4f39 100644
--- a/doc/reference/libeutil/Makefile.am
+++ b/doc/reference/evolution-util/Makefile.am
@@ -1,8 +1,8 @@
 # The name of the module.
-DOC_MODULE = libeutil
+DOC_MODULE = evolution-util
 
 # The top-level SGML file.
-DOC_MAIN_SGML_FILE = libeutil-docs.sgml
+DOC_MAIN_SGML_FILE = evolution-util-docs.sgml
 
 # Extra options to supply to gtkdoc-scan.
 SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED"
@@ -56,7 +56,7 @@ GTKDOC_CFLAGS  =					\
 	$(NULL)
 
 GTKDOC_LIBS = 						\
-	$(top_builddir)/e-util/libeutil.la		\
+	$(top_builddir)/e-util/libevolution-util.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
 	$(GTKHTML_LIBS)					\
diff --git a/doc/reference/libeutil/libeutil-docs.sgml b/doc/reference/evolution-util/evolution-util-docs.sgml
index 0928cdab4c..b19e00c505 100644
--- a/doc/reference/libeutil/libeutil-docs.sgml
+++ b/doc/reference/evolution-util/evolution-util-docs.sgml
@@ -1,14 +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" [
-<!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED '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" xmlns:xi="http://www.w3.org/2003/XInclude">
+<book id="index">
   <bookinfo>
     <title>Evolution Utilities 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/libeutil/">http://library.gnome.org/devel/libeutil/</ulink>.
+      <ulink role="online-location" url="http://developer.gnome.org/evolution-util/">http://developer.gnome.org/evolution-util/</ulink>.
     </releaseinfo>
   </bookinfo>
 
@@ -271,7 +272,7 @@
     <xi:include href="xml/e-url-entry.xml"/>
   </chapter>
 
-  <chapter>
+  <chapter id="object-tree">
     <title>Object Hierarchy</title>
     <xi:include href="xml/tree_index.sgml"/>
   </chapter>
diff --git a/doc/reference/libeutil/libeutil-overrides.txt b/doc/reference/evolution-util/evolution-util-overrides.txt
index e69de29bb2..e69de29bb2 100644
--- a/doc/reference/libeutil/libeutil-overrides.txt
+++ b/doc/reference/evolution-util/evolution-util-overrides.txt
diff --git a/doc/reference/libeutil/libeutil-sections.txt b/doc/reference/evolution-util/evolution-util-sections.txt
index 7b4df3e066..7b4df3e066 100644
--- a/doc/reference/libeutil/libeutil-sections.txt
+++ b/doc/reference/evolution-util/evolution-util-sections.txt
diff --git a/doc/reference/libeutil/libeutil.types b/doc/reference/evolution-util/evolution-util.types
index 41065e0c65..41065e0c65 100644
--- a/doc/reference/libeutil/libeutil.types
+++ b/doc/reference/evolution-util/evolution-util.types
diff --git a/doc/reference/libeshell/Makefile.am b/doc/reference/libeshell/Makefile.am
index c9afa908ae..90260b593c 100644
--- a/doc/reference/libeshell/Makefile.am
+++ b/doc/reference/libeshell/Makefile.am
@@ -29,7 +29,7 @@ GTKDOC_CFLAGS= \
 GTKDOC_LIBS=								\
 	$(top_builddir)/libemail-engine/libemail-engine.la		\
 	$(top_builddir)/shell/libeshell.la				\
-	$(top_builddir)/e-util/libeutil.la				\
+	$(top_builddir)/e-util/libevolution-util.la			\
 	$(EVOLUTION_DATA_SERVER_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)						\
 	$(GTKHTML_LIBS)							\