5 files changed, 24 insertions, 48 deletions
diff --git a/doc/devel/calendar/architecture.sgml b/doc/devel/calendar/architecture.sgml
index 08e4c82b35..f121144d29 100644
--- a/doc/devel/calendar/architecture.sgml
+++ b/doc/devel/calendar/architecture.sgml
@@ -2,10 +2,10 @@
     <title>Architecture of the Calendar</title>
 
     <para>
-      This chapter gives an overview of the Evolution Calendar
+      This chapter gives an overview of the &Evolution; Calendar
       architecture.  It describes the model/view split of the calendar
-      into a personal calendar server, or PCS, and the GUI clients
-      that appear inside the Evolution shell.
+      into a personal calendar server, or &PCS;, and the GUI clients
+      that appear inside the &Evolution; Shell.
     </para>
 
     <!-- Model/View Separation -->
@@ -14,7 +14,7 @@
       <title>Model/View Separation</title>
 
       <para>
-	Like other base components in Evolution, the calendar
+	Like other base components in &Evolution;, the calendar
 	separates the data model from the views or clients.  This is
 	done so that multiple clients can access the same calendar
 	data in an orderly fashion and without clashes.  For example,
@@ -30,7 +30,7 @@
       </para>
 
       <para>
-	Evolution puts the calendar storage in a daemon called the
+	&Evolution; puts the calendar storage in a daemon called the
 	Wombat and completely separates it from clients who wants to
 	access calendar data.  This part of the Wombat is called the
 	personal calendar server, or &PCS;.  Clients must contact the
diff --git a/doc/devel/calendar/cal-util/tmpl/cal-component.sgml b/doc/devel/calendar/cal-util/tmpl/cal-component.sgml
index 2f800e583f..56a04b02a0 100644
--- a/doc/devel/calendar/cal-util/tmpl/cal-component.sgml
+++ b/doc/devel/calendar/cal-util/tmpl/cal-component.sgml
@@ -95,7 +95,7 @@ RFC 2445 iCalendar component object.
 <!-- ##### ENUM CalComponentField ##### -->
   <para>
     These values are used as identifiers for #ETable columns.  These
-    are used by the calendar GUI code in Evolution.
+    are used by the calendar GUI code in &Evolution;.
   </para>
 
 @CAL_COMPONENT_FIELD_CATEGORIES: Component's list of categories.
diff --git a/doc/devel/calendar/evolution-calendar.sgml b/doc/devel/calendar/evolution-calendar.sgml
index f3936d9bbc..82015689ec 100644
--- a/doc/devel/calendar/evolution-calendar.sgml
+++ b/doc/devel/calendar/evolution-calendar.sgml
@@ -1,4 +1,4 @@
-  <part>
+  <part id="evolution-calendar">
     <docinfo>
       <authorgroup>
 	<author>
@@ -13,30 +13,30 @@
       </authorgroup>
     </docinfo>
 
-    <title>Developing Applications for the Evolution Calendar</title>
+    <title>Developing Applications with the &Evolution; Calendar</title>
 
     <partintro>
       <para>
-	This part of the Evolution Developer's Guide describes how to
-	write applications for the Evolution Calendar by using its
-	public interfaces.  The Evolution Calendar exports its
+	This part of the &Evolution; Developer's Guide describes how
+	to write applications for the &Evolution; Calendar by using
+	its public interfaces.  The &Evolution; Calendar exports its
 	functionality through a number of interfaces, including CORBA,
 	GTK+ wrappers for Bonobo objects, and other utility libraries.
+	This part also describes the internals of the calendar so that
+	it will be easy for you to make changes to &Evolution;'s core
+	code.
       </para>
 
       <para>
-	You should read this part of the Evolution Developer's guide
+	You should read this part of the &Evolution; Developer's guide
 	if you intend to write client applications that use the
-	functionality of the Evolution Calendar.
-      </para>
-
-      <para>
-	This part does not describe the internal interfaces of the
-	Evolution Calendar; for that you should read the Evolution
-	Internals Guide.  You should only need to read that guide if
-	you are interested in the way the calendar works internally or
-	if you want to make changes directly to the Evolution Calendar
-	code.
+	functionality of the &Evolution; Calendar, such as its storage
+	interfaces and generic recurrence engine.  If you intend to
+	make changes to the calendar's core code, it will be useful to
+	read the sections on the calendar internals as well.  Even if
+	you do not intend to modify the core code of the calendar, it
+	may be useful to know a few things about the way it works so
+	that you can make better use of the public interfaces.
       </para>
     </partintro>
 
diff --git a/doc/devel/calendar/public-reference.sgml b/doc/devel/calendar/public-reference.sgml
index f8aa6e848d..b880bd2972 100644
--- a/doc/devel/calendar/public-reference.sgml
+++ b/doc/devel/calendar/public-reference.sgml
@@ -1,10 +1,10 @@
-  <reference>
+  <reference id="calendar-public-reference">
     <title>Calendar Public API Reference</title>
 
     <partintro>
       <para>
 	This part presents the class and function reference for the
-	public APIs of the different components of the Evolution
+	public APIs of the different components of the &Evolution;
 	Calendar.
       </para>
     </partintro>
diff --git a/doc/devel/calendar/reference.sgml b/doc/devel/calendar/reference.sgml
deleted file mode 100644
index f8aa6e848d..0000000000
--- a/doc/devel/calendar/reference.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-  <reference>
-    <title>Calendar Public API Reference</title>
-
-    <partintro>
-      <para>
-	This part presents the class and function reference for the
-	public APIs of the different components of the Evolution
-	Calendar.
-      </para>
-    </partintro>
-
-    &CalClient;
-    &CalComponent;
-    &cal-util;
-    &cal-recur;
-    &timeutil;
-  </reference>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")
-End:
--->