Moved introductory/basic content to the usage-mainwindow.sgml file.

2001-08-20  Aaron Weber  <aaron@ximian.com>

	* C/usage-exec-summary.sgml: Moved introductory/basic content to the
	usage-mainwindow.sgml file. Rewrote intro.

	* C/usage-contact.sgml: Moved introductory/basic content to the
	usage-mainwindow.sgml file.Rewrote intro.

	* C/usage-calendar.sgml: Moved introductory/basic content to the
	usage-mainwindow.sgml file.Rewrote intro.

	* C/usage-mail.sgml: Moved introductory/basic content to the
	usage-mainwindow.sgml file.Rewrote intro.

	* C/usage-mainwindow.sgml: Put summary-type info into
	this file from other chapters.

svn path=/trunk/; revision=12328

7 files changed, 372 insertions, 321 deletions

diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index f1f14584b5..fa03971fc9 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -167,3 +167,4 @@
       </formalpara>
   </sect1>
 </preface>
+
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index 7d009eeb8c..8c4b48ebc2 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -4,66 +4,15 @@
 
 <chapter id="usage-calendar">
   <title>Managing your Schedule</title>
-  <para>
-    To begin using the calendar, select
-    <guibutton>Calendar</guibutton> from the <interface>shortcut
-    bar</interface>.  By default, the calendar starts showing today's
-    schedule on a ruled background.  At the upper right, there's a
-    monthly calendar you can use to switch days.  Below that, there's
-    a <guilabel>TaskPad</guilabel>, where you can keep a list of tasks
-    separate from your calendar appointments.  The calendar's daily
-    view is shown in <xref linkend="usage-calendar-fig">.
 
-   <!-- ============== Figure ============================= -->
-    <figure id="usage-calendar-fig">
-      <title>Evolution Calendar View</title>
-      <screenshot>
-	<screeninfo>Evolution Contact Manager Window</screeninfo>
-	<graphic fileref="figures/calendar" format="png" srccredit="Aaron Weber">
-	</graphic>
-      </screenshot>
-    </figure>
-  <!-- ============== End of Figure ============================= --> 
+     <para>
+      This chapter will show you how to use the Ximian Evolution
+      Calendar to manage your schedule alone or in conjunction with
+      others.
+     </para>
 
-  </para>
-
-  <para>
-    <inlinegraphic fileref="figures/full-1" format="png"></inlinegraphic>
-    <guilabel>Appointment List</guilabel>
-  </para>
-  
-  <para>
-    The <guilabel>Appointment List</guilabel> is responsible for showing you all of
-    your scheduled appointments, whether they are all day appointments or simply one time
-    appointments that last a half an hour.
-  </para>
-
-  <para>
-    <inlinegraphic fileref="figures/full-2" format="png"></inlinegraphic>
-    <guilabel>Todo List</guilabel>
-  </para>
-  
-  <para>
-    The <guilabel>Todo List</guilabel> compliments the <guilabel>Appointment List
-    </guilabel> as it keeps track of your chores or tasks which don't have
-    any time associated with them.  These may include "Clean Room" or "Call
-    Repairman".
-  </para>
-
-  <para>
-    <inlinegraphic fileref="figures/full-3" format="png"></inlinegraphic>
-    <guilabel>Calendar Window</guilabel>
-  </para>
-  
-  <para>
-    The <guilabel>Calendar Window</guilabel> has a graphical representation of
-    the calendar, so you can select what days to view in the <guilabel>Appointment
-    List</guilabel>.
-  </para>
-  
     <sect1 id ="usage-calendar-view"> 
     <title>Ways of Looking at your Calendar</title>
-
     <para>
        The toolbar offers you four different views of your calendar:
        one day, five days, a week, or a month at once. Press the
@@ -87,19 +36,6 @@
        box that appears.
     </para>
 
-
-<!-- ############### FIXME FIXME FIXME ############
-Feature not yet implemented, and may not be implemented due to
-lack of time, resources, and interest.
-    <para>
-       In addition, <application>Evolution</application> supports
-       Hebrew, Muslim, and other calendar formats.  To switch to a
-       different calendar format, choose
-       <guimenuitem>GUIMENUITEM</guimenuitem> from the
-       <guimenu>GUIMENU</guimenu>.
-    </para>
-################  END FIXME AREA   ##################   -->
-
   </sect1>
   <sect1 id="usage-calendar-apts">
     <title>Scheduling With the Evolution Calendar</title>
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index a168ef1087..ec3d504f6b 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -4,76 +4,21 @@
 
 <chapter id="usage-contact">
   <title>Working with Your Contacts</title>
-  <abstract>
-    <para>
-      The <application>Evolution</application> address book can
-      handle all of the functions of an address book, phone book, or
-      Rolodex.  Of course, it's a lot easier to update
-      <application>Evolution</application> than it is to change an
-      actual paper book. <application>Evolution</application> also
-      allows easy synchronization with hand-held devices.  Since
-      <application>Evolution</application> supports the <glossterm
-      linkend="ldap">LDAP</glossterm> directory protocol, you can use
-      it with almost any type of existing directory server on your
-      network.
-    </para>
-    <para>
-      Another advantage of the <application>Evolution</application>
-      address book is its integration with the rest of the
-      application.  When you look for someone's address, you can also
-      see a history of appointments with that person.  Or, you can
-      create address cards from emails with just a few clicks.  In
-      addition, searches and folders work in the same way they do in
-      the rest of <application>Evolution</application>.
-    </para>
-    <para>
-      This chapter will show you how to use the
-      <application>Evolution</application> address book to organize
-      any amount of contact information, share addresses over a
-      network, and several ways to save time with everyday tasks. To
-      learn about configuring the address book, see <xref
-      linkend="config-prefs-contact">.
-    </para>
-  </abstract>
-  <sect1 id="usage-contact-basic">
-    <title>Getting Started With the Address Book</title>	
-    
-    <figure id="usage-contact-fig">
-      <title>Evolution Contact Interface</title>
-      <screenshot>
-	<screeninfo>Evolution Contact List Window</screeninfo>
-	<graphic fileref="figures/contact" format="png" srccredit="Kevin Breit">
-	</graphic>
-      </screenshot>
-    </figure>
-
-    <para>
-      <inlinegraphic fileref="figures/full-1" format="png"></inlinegraphic>
-      <guilabel>Contact List</guilabel>
-    </para>
-
-    <para>
-      The <guilabel>Contact List</guilabel> lists your contacts.
-    </para>
-
-    <para>
-       To open your address book, click on
-       <guibutton>Contacts</guibutton> in the shortcut bar, or select
-       one of your contacts folders from the folder bar.  <xref
-       linkend="usage-contact-fig"> shows the address book in all
-       its organizational glory.  By default, the address book
-       shows all your cards in alphabetical order, in a <glossterm
-       linkend="minicard">minicard</glossterm> view.  You can select
-       other views from the <guimenu>View</guimenu> menu, and adjust
-       the width of the columns by clicking and dragging the grey
-       column dividers.
-    </para>
+      <para>
+        This chapter will show you how to use the
+        <application>Evolution</application> address book to organize
+        any amount of contact information, share addresses over a
+        network, and several ways to save time with everyday tasks. To
+        learn about configuring the address book, see <xref
+        linkend="config-prefs-contact">.
+      </para>
 
     <para>
        The toolbar for the address book is quite simple.
        <itemizedlist>
 	<listitem><para>
-           <guibutton>New</guibutton> creates a new card.
+           Click <guibutton>New</guibutton> to create a new card, or double-click 
+           in a blank space in the contact list. 
 	</para></listitem>
 
 	<listitem><para>
@@ -108,7 +53,6 @@
        more than a few people listed, you'll want some way of finding
        them more quickly, which is why there's a search feature.
     </para>
-  </sect1>
 
   <sect1 id="usage-contact-cards">
     <title>The Contact Editor</title>
diff --git a/help/C/usage-exec-summary.sgml b/help/C/usage-exec-summary.sgml
index dc4a5d3160..7c18a2e820 100644
--- a/help/C/usage-exec-summary.sgml
+++ b/help/C/usage-exec-summary.sgml
@@ -1,27 +1,21 @@
 <chapter id="usage-exec-summary">
    <title>Using the Ximian Evolution Summary</title>
-    <para>
-       The Ximian Evolution Summary is designed to show you a
-       summary of important information: the appointments for a given
-       day, important email, and so forth. To see the Summary, 
-       click on the <guibutton>Summary</guibutton>
-       button in the shortcut bar, or select the
-       <guilabel>Summary</guilabel> folder in the folder
-       bar.
-    </para>
+
 
     <sect1 id="exec-intro">
       <title>Introducing Summary</title>
       <para>
-        The first thing you'll want to do with Summary
-        is add a service. Go to
-      <menuchoice>
-	<guimenu>Tools</guimenu>
-	<guimenuitem>Summary Settings</guimenuitem>
-      </menuchoice>
-      then select one of the available
-      services.  Services may vary depending upon your system, but
-      most installations will have at least the following options:
+         The Ximian Evolution Summary can show you what you need to
+         know at a glance.  To make it work for you, you can customize
+         it so it displays the information you want, when you want it.
+      </para>
+      <para>
+        To begin customizing your Summary, select <menuchoice>
+        <guimenu>Tools</guimenu> <guimenuitem>Summary
+        Settings</guimenuitem> </menuchoice>, then select one of the
+        available services.  Services may vary depending upon your
+        system, but most installations will have at least the
+        following options:
       <variablelist>
 
 	<varlistentry>
@@ -174,14 +168,4 @@
       </sect3>
     </sect2>
   </sect1>
-</chapter>
-
-
-
-
-
-
-
-
-
-
+</chapter>
\ No newline at end of file
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 53f01af0da..54922ecac4 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -1,69 +1,29 @@
 <!--
 <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
 -->
+
 <chapter id="usage-mail">
   <title>Using Evolution for Email</title>
-  <abstract>
-    <title> A Guide to the Evolution Mailer</title>
-    <para>
-       <application>Evolution</application> email is like other email
-       programs in all the ways that matter:
-     <itemizedlist>
-       <listitem>
-         <para>
-           It can sort and organize your mail in a wide variety of ways with
-           folders, searches, and filters.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-          It can send and receive mail in HTML or as plain text, and
-          makes it easy to send and recieve multiple file attachments.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           It supports multiple mail sources, including <glossterm
-           linkend="imap">IMAP</glossterm>, <glossterm
-           linkend="pop">POP3</glossterm>, local
-           <systemitem><filename>mbox</filename></systemitem> and
-           <systemitem><filename>mh</filename></systemitem> files, and
-           even NNTP messages (newsgroups), which aren't technically
-           email.
-         </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Lets you enhance your security with encryption.
-	  </para>
-	</listitem>
-     </itemizedlist>
-    </para>
-    <para>
-      However, <application>Evolution</application> has some important
-      differences.  First, it's built to handle very large amounts of
-      mail.  Both the <link
-      linkend="usage-mail-organize-filters">filtering</link> and <link
-      linkend="usage-mail-organize-search">searching</link> functions
-      were built for speed and efficiency on large volumes of
-      mail. There's also the <application>Evolution</application>
-      <link linkend="usage-mail-organize-vFolders">vFolder</link>, an
-      advanced organizational feature not found in mainstream mail
-      clients.  If you get a lot of mail, or if you keep every message
-      you get in case you need to refer to it later, you'll find this
-      feature especially useful.
-    </para>
-  </abstract>
+  <para>
+     This chapter, and <xref linkend="usage-mail-organize">, will
+     provide you with an in-depth guide to the capabilities of
+     Evolution as a mail client.  For information about how to set up
+     your mail account, see <xref linkend="config-prefs-mail">.
+  </para>
 
   <sect1 id="usage-mail-getnsend-read">
-      <title>Reading Mail</title>
-      <para>
-       You can start reading email by clicking
-       <guibutton>Inbox</guibutton> in the shortcut bar. The first
-       time you use <application>Evolution</application>, it will
-       start with the <interface>Inbox</interface> open and show you a
-       message from Ximian welcoming you to the application.
-      </para>
+      <title>Reading Mail</title>    
+    <para>
+        Start the mail client by clicking on the
+        <guibutton>Inbox</guibutton> icon in the shortcut bar, or by
+        selecting a mail folder in the folder bar.  To read a message,
+        select it in the message list; if you'd like to see it in its
+        own window, double-click on it or press
+          <keycombo action="simul">
+		<keycap>Ctrl</keycap>
+		<keycap>O</keycap>
+	      </keycombo>.
+     </para>
 
       <tip id="spaceandbs">
 	<title>Reading Mail with the Keyboard</title>
@@ -74,80 +34,6 @@
 	</para>
       </tip>
 
-      <para>
-        Your <application>Evolution</application>
-        <guilabel>Inbox</guilabel> will look something like the one in
-        <xref linkend="usage-mail-intro-fig">.
-        If you find the <interface>view pane</interface> too small, you can resize
-        the pane, enlarge the whole window, or double-click on the
-        message in the <interface>message list</interface> to have it
-        open in a new window.  To change the sizes of a pane, just click
-        and hold on the divider between the two panes.  Then you can drag
-        up and down to select the size of the panes.  Just like with
-        folders, you can right-click on messages in the message list and
-        get a menu of possible actions.
-     </para>
-
- <!-- ==============Figure=================================== -->
-
-      <figure id="usage-mail-intro-fig">
-          <title>Evolution Mail</title>
-          <screenshot>
-            <screeninfo>Inbox</screeninfo>
-            <graphic fileref="figures/mail-inbox" format="png" srccredit="Kevin Breit">
-        </graphic>
-        </screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-    <para>
-      <inlinegraphic fileref="figures/full-1" format="png"></inlinegraphic>
-      <guilabel>Email Viewer</guilabel>
-    </para>
-    
-    <para>
-      This is where your email is displayed.
-    </para>
-
-    <para>
-      <inlinegraphic fileref="figures/full-2" format="png"></inlinegraphic>
-      <guilabel>Email List</guilabel>
-    </para>
-    
-    <para>
-      The <guilabel>Email List</guilabel> displays all the emails that you
-      have.  This includes all your read, unread, and email that is flagged 
-      to be deleted.
-    </para>
-    
-    <para>
-      Most of the mail-related actions you'll want to perform are
-      listed in the <guimenu>Message</guimenu> menu in the menu bar.
-      The most frequently used ones, like
-      <guimenuitem>Reply</guimenuitem> and
-      <guimenuitem>Forward</guimenuitem>, also appear as buttons in
-      the toolbar. Almost all of them are also located in the
-      right-click menu and as keyboard shortcuts, which tend to be
-      faster once you get the hang of them.  You can choose whichever
-      way you like best; the idea is that the software should work the
-      way you want, rather than making you work the way the it does.
-      
-      <tip id="view-headers">
-	<title>Email Headers</title>
-	<para>
-	  To look at the complete headers for email messages, select
-	  <menuchoice><guimenu>View</guimenu><guisubmenu>Message
-	  Display</guisubmenu><guimenuitem>Show Full
-	  Headers</guimenuitem></menuchoice>. To see absolutely every
-	  bit, choose
-	  <menuchoice><guimenu>View</guimenu><guisubmenu>Message
-	  Display</guisubmenu><guimenuitem>Show Email Source
-	  </guimenuitem></menuchoice>.
-       </para>
-      </tip>
-
-    </para>
-    
     <sect2 id="usage-mail-listorder">
       <title>Sorting the message list</title>
       <para>
@@ -166,6 +52,21 @@
 	instructions on how to customize your message display
 	columns in <xref linkend="usage-mail-organize-columns">.
       </para>
+
+      <tip id="view-headers">
+	<title>Email Headers</title>
+	<para>
+	  To look at the complete headers for email messages, select
+	  <menuchoice><guimenu>View</guimenu><guisubmenu>Message
+	  Display</guisubmenu><guimenuitem>Show Full
+	  Headers</guimenuitem></menuchoice>. To see absolutely every
+	  bit, choose
+	  <menuchoice><guimenu>View</guimenu><guisubmenu>Message
+	  Display</guisubmenu><guimenuitem>Show Email Source
+	  </guimenuitem></menuchoice>.
+       </para>
+      </tip>
+
       <para>
 	You can also choose a threaded message view. Select
 	<menuchoice> 
@@ -912,16 +813,15 @@ with quoted materials and the relevant replies interspersed-->
           <para>
             Some people do not have HTML-capable mail clients, or
             prefer not to receive HTML-enhanced mail because it is
-            slower to download and display.  <emphasis>Some</emphasis>
-            people don't like HTML mail and
-            get very angry if you send them HTML mail, which is why
+            slower to download and display. Because some people may
+            prefer not to get HTML mail,
             <application>Evolution</application> sends plain text
             unless you explicitly ask for HTML.  To send HTML mail,
             you will need to select <menuchoice>
             <guimenu>Format</guimenu> <guimenuitem>
-            HTML</guimenuitem></menuchoice>.  Alternately, you can set
-            your default mail format preferences in the mail
-            configuration dialog.  See <xref
+            HTML</guimenuitem></menuchoice>.  To send all your mail as
+            HTML, you can set your default mail format preferences in
+            the mail configuration dialog.  See <xref
             linkend="config-prefs-mail-other"> for more information.
           </para>
         </note>
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 26db4d892d..7d54c9a033 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -24,11 +24,13 @@
     </para>
 
     <sect2 id="first-step">
-      <title>Step 1 of 4</title>
+      <title>Defining Your Identity</title>
       <para>
 	The Identity window is the first of four steps in the
 	assistant.  The identity step will ask you to enter your basic
-	personal information.
+	personal information.  You can define multiple identities
+	later on with the <menuchoice><guimenu>Tools</guimenu>
+	<guimenuitem>Mail Settings</guimenuitem></menuchoice> tool.
 	<itemizedlist>
 	  <listitem>
 	    <para>
@@ -60,7 +62,7 @@
     </sect2>
 
     <sect2 id="second-step">
-      <title>Step 2 of 4</title>
+      <title>Recieving Email</title>
       <para>
 	The <guilabel>Recieving Email</guilabel> step lets you configure
 	receving email people have sent you.
@@ -135,7 +137,7 @@
       </para>
     </sect2>
     <sect2 id="third-step">
-      <title>Step 3 or 4</title>
+      <title>Sending Email</title>
       <para>
 	The <guilabel>Sending Email</guilabel> step lets you configure sending 
 	email.
@@ -202,13 +204,10 @@
     </sect2>
 
   <sect2 id="fourth-step">
-      <title>Step 4 of 4</title>
+      <title>Importing Mail (Optional)</title>
       <para>
-	Chances are, <application>Evolution</application> isn't your first email
-	program.  You're probably switching from another program and will want
-	access to your email from your old program.  It's for exactly these 
-	situations that <application>Evolution</application> includes an import 
-	feature.
+	If <application>Evolution</application> finds mail or address
+	files from another application, it will offer to import them.
       </para>
       <para>
 	<application>Evolution</application> can import the following types of
@@ -522,7 +521,7 @@
 
     </para>
     <tip id="foldertips">
-    <title>Navigating without the Folder Bar</title>
+    <title>Navigating without the Folder Bar or the Shortcut Bar</title>
        <para>
          You don't need the folder bar or the shortcut bar to move
          around the main window. You can use <keycap>Tab</keycap> to
@@ -535,9 +534,8 @@
      </tip>
 
     <para>
-       If you get any serious amount of mail, you'll want more folders
-       than just your Inbox.  
-	To create a new folder:
+       If you get large volumes of mail, you'll want more folders than
+       just your Inbox.  To create a new folder:
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
@@ -758,10 +756,275 @@
       everything that's going on.
     </para>
     </sect2>
+    <sect2 id="basics-summary">
+      <title>Introducing the Summary</title>
+      <para>
+         The Ximian Evolution Summary provides you with a quick
+         run-down of important information: your appointments for a
+         given day, how much new mail you have, headlines from
+         selected news services, and so forth. To see the Summary,
+         click on the <guibutton>Summary</guibutton> button in the
+         shortcut bar, or select the <guilabel>Summary</guilabel>
+         folder in the folder bar.
+      </para>
+
+      <para>
+        FIXME: Insert picture of the Summary and labels here.
+      </para>
+
+      <para>
+        To add additional services to your Summary, or to edit the
+        existing services, select
+        <menuchoice>
+	  <guimenu>Tools</guimenu> 
+	  <guimenuitem>Summary Settings</guimenuitem> 
+	</menuchoice>.
+      </para>
+
+    </sect2>
+
+    <sect2 id="basics-mail">
+      <title>Introducing Email</title>
+      <para>
+         <application>Evolution</application> email is like other
+         email programs in several ways:
+     <itemizedlist>
+	  <listitem>
+	    <para>
+              It can sort and organize your mail in a wide variety of
+              ways with folders, searches, and filters.
+           </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+              It can send and receive mail in HTML or as plain text,
+              and makes it easy to send and recieve multiple file
+              attachments.
+           </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+              It supports multiple mail sources, including <glossterm
+              linkend="imap">IMAP</glossterm>, <glossterm
+              linkend="pop">POP3</glossterm>, local
+              <systemitem><filename>mbox</filename></systemitem> and
+              <systemitem><filename>mh</filename></systemitem> files,
+              and even NNTP messages (newsgroups), which aren't
+              technically email.
+            </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      It lets you guard your privacy with encryption.
+	    </para>
+	  </listitem>
+	</itemizedlist>
+      </para>
+      <para>
+        However, <application>Evolution</application> has some
+        important differences.  First, it's built to handle very large
+        amounts of mail.  Both the <link
+        linkend="usage-mail-organize-filters">filtering</link> and
+        <link linkend="usage-mail-organize-search">searching</link>
+        functions were built for speed and efficiency on large volumes
+        of mail. There's also the <application>Evolution</application>
+        <link linkend="usage-mail-organize-vFolders">vFolder</link>,
+        an advanced organizational feature not found in mainstream
+        mail clients.  If you get a lot of mail, or if you keep every
+        message you get in case you need to refer to it later, you'll
+        find this feature especially useful.
+     </para>
+     <para>
+        Here's what the mailer looks like:
+
+ <!-- ==============Figure=================================== -->
+
+      <figure id="usage-mail-intro-fig">
+          <title>Evolution Mail</title>
+          <screenshot>
+            <screeninfo>Inbox</screeninfo>
+            <graphic fileref="figures/mail-inbox" format="png" srccredit="Kevin Breit">
+        </graphic>
+        </screenshot>
+      </figure>
+<!-- ==============End of Figure============================== -->
+</para>
+      <para>
+        <inlinegraphic fileref="figures/full-1"
+        format="png"></inlinegraphic> <guilabel>Email
+        Viewer</guilabel>
+      </para>
+    
+      <para>
+        This is where your email is displayed.
+      </para>
+
+      <para>
+        <inlinegraphic fileref="figures/full-2"
+        format="png"></inlinegraphic> <guilabel>Email List</guilabel>
+      </para>
+    
+      <para>
+        The <guilabel>Email List</guilabel> displays all the emails
+        that you have.  This includes all your read, unread, and email
+        that is flagged to be deleted.
+      </para>
+
+      <para>
+     If you find the <interface>view pane</interface> too small, you can resize
+        the pane, enlarge the whole window, or double-click on the
+        message in the <interface>message list</interface> to have it
+        open in a new window.  To change the sizes of a pane, just click
+        and hold on the divider between the two panes.  Then you can drag
+        up and down to select the size of the panes.  Just like with
+        folders, you can right-click on messages in the message list and
+        get a menu of possible actions.
+      </para>
+      <para>
+        Most of the mail-related actions you'll want to perform are
+        listed in the <guimenu>Message</guimenu> menu in the menu bar.
+        The most frequently used ones, like
+        <guimenuitem>Reply</guimenuitem> and
+        <guimenuitem>Forward</guimenuitem>, also appear as buttons in
+        the toolbar. Almost all of them are also located in the
+        right-click menu and as keyboard shortcuts, which tend to be
+        faster once you get the hang of them.  You can choose
+        whichever way you like best; the idea is that the software
+        should work the way you want, rather than making you work the
+        way the it does.
+      </para>
+
+       <para>
+         For an in-depth guide to the email capabilities of Ximian
+         Evolution, read <xref linkend="usage-mail">.
+      </para>
+    </sect2>
+    <sect2 id="basics-calendar">
+      <title>Introducing the Calendar</title>
+      <para>
+       To begin using the calendar, select
+       <guibutton>Calendar</guibutton> from the <interface>shortcut
+       bar</interface>.  By default, the calendar starts showing
+       today's schedule on a ruled background.  At the upper right,
+       there's a monthly calendar you can use to switch days.  Below
+       that, there's a <guilabel>TaskPad</guilabel>, where you can
+       keep a list of tasks separate from your calendar appointments.
+       The day view in the calendar looks like this:
+
+   <!-- ============== Figure ============================= -->
+    <figure id="usage-calendar-fig">
+      <title>Evolution Calendar View</title>
+      <screenshot>
+	<screeninfo>Evolution Contact Manager Window</screeninfo>
+	<graphic fileref="figures/calendar" format="png" srccredit="Aaron Weber">
+	</graphic>
+      </screenshot>
+    </figure>
+  <!-- ============== End of Figure ============================= --> 
+
+    </para>
+
+      <para>
+        <inlinegraphic fileref="figures/full-1"
+        format="png"></inlinegraphic> <guilabel>Appointment
+        List</guilabel>
+      </para>
+  
+      <para>
+	The <guilabel>Appointment List</guilabel> is responsible for showing you all of
+	your scheduled appointments, whether they are all day appointments or simply one time
+	appointments that last a half an hour.
+      </para>
+
+      <para>
+	<inlinegraphic fileref="figures/full-2" format="png"></inlinegraphic>
+	<guilabel>Todo List</guilabel>
+      </para>
+
+      <para>
+        The <guilabel>Todo List</guilabel> compliments the
+        <guilabel>Appointment List </guilabel> as it keeps track of
+        tasks which don't have any time associated with them.  These
+        may include "" or "Call Repairman".  </para>
+
+      <para>
+	<inlinegraphic fileref="figures/full-3" format="png"></inlinegraphic>
+	<guilabel>Calendar Window</guilabel>
+      </para>
+
+      <para>
+	The <guilabel>Calendar Window</guilabel> has a graphical representation of
+	the calendar, so you can select what days to view in the <guilabel>Appointment
+	List</guilabel>.
+      </para>
+
+      <para>
+          For more information about the calendar
+          read <xref linkend="usage-calendar">.
+      </para>
+
+    </sect2>
+    <sect2 id="basics-contacts">
+      <title>Introducing the Address Book</title>
+      <para>
+        The <application>Evolution</application> address book can
+        handle all of the functions of an address book, phone book, or
+        Rolodex.  Of course, it's a lot easier to update
+        <application>Evolution</application> than it is to change an
+        actual paper book. <application>Evolution</application> also
+        allows easy synchronization with hand-held devices.  Since
+        <application>Evolution</application> supports the <glossterm
+        linkend="ldap">LDAP</glossterm> directory protocol, you can
+        use it with almost any type of existing directory server on
+        your network.
+      </para>
+      <para>
+        Another advantage of the <application>Evolution</application>
+        address book is its integration with the rest of the
+        application.  For example, you can create an address card from
+        an email just by right-clicking on the sender's email address.
+      </para>
+      <para>
+        To open your address book, click on
+        <guibutton>Contacts</guibutton> in the shortcut bar, or select
+        one of your contacts folders from the folder bar.  <xref
+        linkend="usage-contact-fig"> shows the address book in all its
+        organizational glory.  By default, the address book shows all
+        your cards in alphabetical order, in a <glossterm
+        linkend="minicard">minicard</glossterm> view.  You can select
+        other views from the <guimenu>View</guimenu> menu, and adjust
+        the width of the columns by clicking and dragging the grey
+        column dividers.
+      </para>
+      <para>
+        The address book looks like this:
+
+      <figure id="usage-contact-fig">
+	<title>Evolution Contact Interface</title>
+	<screenshot>
+	  <screeninfo>Evolution Contact List Window</screeninfo>
+	  <graphic fileref="figures/contact" format="png" srccredit="Kevin Breit">
+  	  </graphic>
+	</screenshot>
+      </figure>
+     </para>
+      <para>
+        <inlinegraphic fileref="figures/full-1"
+        format="png"></inlinegraphic> <guilabel>Contact
+        List</guilabel>
+      </para>
+
+      <para>
+        The <guilabel>Contact List</guilabel> lists your contacts.
+      </para>
+      <para>
+          For detailed instructions on how to use the address book,
+          read <xref linkend="usage-contact">.
+      </para>
+    </sect2>
+
   </sect1>
- 
 </chapter>
 
 
 
-
diff --git a/help/ChangeLog b/help/ChangeLog
index 07d313c894..4ee54f5cef 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,12 +1,35 @@
+2001-08-20  Aaron Weber  <aaron@ximian.com>
+
+	* C/usage-exec-summary.sgml: Moved introductory/basic content to the
+	usage-mainwindow.sgml file. Rewrote intro.
+
+	* C/usage-contact.sgml: Moved introductory/basic content to the
+	usage-mainwindow.sgml file.Rewrote intro.
+
+	* C/usage-calendar.sgml: Moved introductory/basic content to the
+	usage-mainwindow.sgml file.Rewrote intro.
+
+	* C/usage-mail.sgml: Moved introductory/basic content to the
+	usage-mainwindow.sgml file.Rewrote intro.
+
+	* C/usage-mainwindow.sgml: Put summary-type info into
+	this file from other chapters.
+	
+	* C/topic.dat: New file. Help Menu info.
+
 2001-08-20  Kevin Breit  <battery841@mediaone.net>
 
 	* C/usage-calendar.sgml: Did more event -> appointment conversions.
 
 2001-08-18  Kevin Breit  <battery841@mediaone.net>
 
-	* C/usage-calendar.sgml: Renamed events to appointments (please review for me as it was a simple regex replace).
+	* C/usage-calendar.sgml: Renamed events to appointments (please
+	review for me as it was a simple regex replace).
 
-	* C/usage-mail.sgml: Removed "emoticon" and "root of all evil", removed gargantuan, removed instances of "the the", changes Virtual Folders to vFolders, renamed "Attachements and HTML Mail" section, reworded "Embellish" to say "Enhance"
+	* C/usage-mail.sgml: Removed "emoticon" and "root of all evil",
+	removed gargantuan, removed instances of "the the", changes
+	Virtual Folders to vFolders, renamed "Attachements and HTML Mail"
+	section, reworded "Embellish" to say "Enhance"
 
 2001-08-17  Aaron Weber  <aaron@ximian.com>