Credit kmarass.

2001-09-04  Aaron Weber  <aaron@ximian.com>

	* C/apx-authors.sgml: Credit kmarass.

	* C/usage-contact.sgml: groups-of-contacts-management.

	* C/usage-mainwindow.sgml: Add more info, "whatis" section,
	"Ximian Evolution" and "vFolder."

	* C/evolution.sgml: "Ximian Evolution" not "Evolution"

	* C/preface.sgml: Moved "whatis" section to usage-mainwindow, as
	per new-outline.

	* C/usage-mail.sgml: Expand deletion info. Also composer work.

svn path=/trunk/; revision=12581

1 files changed, 18 insertions, 16 deletions

diff --git a/help/C/evolution.sgml b/help/C/evolution.sgml
index ae8aebfd5a..1138c0d0f1 100644
--- a/help/C/evolution.sgml
+++ b/help/C/evolution.sgml
@@ -30,7 +30,7 @@ implemented. -->
 
 <book id="index">
   <bookinfo>
-    <title>A User's Guide to Evolution</title>
+    <title>A User's Guide to Ximian Evolution</title>
     <authorgroup>
       <author><firstname>Aaron</firstname><surname>Weber</surname></author>
       <author><firstname>Kevin</firstname><surname>Breit</surname></author>
@@ -68,7 +68,7 @@ implemented. -->
     </legalnotice>
 
    <releaseinfo>
-      This is version 0.11 of the Evolution manual.
+      This is version 0.11 of the Ximian Evolution manual.
    </releaseinfo>
 
   </bookinfo>
@@ -76,11 +76,11 @@ implemented. -->
   &PREFACE;
   
   <part id="usage">
-    <title>Getting Started with Evolution 1.0</title>
+    <title>Getting Started with Ximian Evolution</title>
      <partintro>
       <para>
-        Part one of the <application>Evolution</application> manual
-        describes how to use <application>Evolution</application> for
+        Part one of the <application>Ximian Evolution</application> manual
+        describes how to use <application>Ximian Evolution</application> for
         email, contact management, and appointment and task
         scheduling.  You'll find as you go along that there's more
         than one way to do things, and you can pick whichever method
@@ -99,19 +99,21 @@ implemented. -->
     &USAGE-PRINT;
   </part>
   <part id="config">
-  <title>Configuring and Managing Evolution</title>
+  <title>Configuring and Managing Ximian Evolution</title>
     <partintro>
       <para>
-        <application>Evolution</application> is highly configurable.
-        Usually, when developers say that, they mean that they didn't
-        test it out thoroughly and have left it to other programmers
-        to "configure" themselves a working system. In the case of
-        <application>Evolution</application>, "configurable", it means that, while you can expect the
-        program to work perfectly well in its default settings, it's
-        also easy to alter its behavior in a wide variety of ways, so
-        that it fits your needs exactly.  This part of the book will
-        describe that process, from the quickest glimpse of the Setup
-        Assistant to an in-depth tour of the preferences dialogs.
+        <application>Ximian Evolution</application> is highly
+        configurable.  Usually, when developers say that, they mean
+        that they didn't test it out thoroughly and have left it to
+        other programmers to "configure" themselves a working
+        system. In the case of <application>Ximian
+        Evolution</application>, "configurable", it means that, while
+        you can expect the program to work perfectly well in its
+        default settings, it's also easy to alter its behavior in a
+        wide variety of ways, so that it fits your needs exactly.
+        This part of the book will describe that process, from the
+        quickest glimpse of the Setup Assistant to an in-depth tour of
+        the preferences dialogs.
       </para>
     </partintro>