Added summary of services, with summary service summaries.

2001-02-14 Aaron Weber <aaron@ximian.com>

	* C/usage-exec-summary.sgml: Added summary of services, with
	summary service summaries.

	* C/usage-contact.sgml: More editing.

	* C/usage-calendar.sgml: More editing.

svn path=/trunk/; revision=8220

6 files changed, 348 insertions, 230 deletions

diff --git a/doc/C/usage-calendar.sgml b/doc/C/usage-calendar.sgml
index 409d63bf90..a2c14e99a6 100644
--- a/doc/C/usage-calendar.sgml
+++ b/doc/C/usage-calendar.sgml
@@ -33,16 +33,18 @@
        The toolbar offers you four different views of your calendar:
        one day, five days, a week, or a month at once. Press the
        calendar-shaped buttons on the right side of the toolbar to
-       switch between views. You can also select a range of days in
-       the small calendar at the upper right.
+       switch between views. You can also select a range of
+       days— three days, ten days, a fortnight if you want
+       — in the small calendar at the upper right.
     </para>
     <para>
-       To view yesterday's appointments, &mdash;last week's, if you're
-       in the weekly view, and last month's for the monthly
-       view&mdash; click the <guibutton>Prev</guibutton> button.  For
-       tomorrow, next week, or next month, click
-       <guibutton>Next</guibutton>.  Of course, click
-       <guibutton>Today</guibutton> for today.
+       The <guibutton>Prev</guibutton> and <guibutton>Next</guibutton>
+       buttons will move you forward and back in your calendar pages.
+       If you're looking at only one day, you'll see tomorrow's page,
+       or yesterday's.  If you're looking at your calendar by week,
+       month, fortnight, or anything else, you'll move around by just
+       that much. To come back to today's listing, click
+       <guibutton>Today</guibutton>.
     </para>
     <para>
        To visit a specific date's calendar entries, click
@@ -145,10 +147,10 @@ lack of time, resources, and interest.
 	    <term><guilabel>Program</guilabel></term>
 	    <listitem>
 	      <para>
-	        Select this if you would like some additional application
-	        to run as a reminder.  You can enter its name in the
-	        text field, or find it with the
-	        <guibutton>Browse</guibutton> button.
+	        Select this if you would like to run a program as a
+	        reminder.  You can enter its name in the text field,
+	        or find it with the <guibutton>Browse</guibutton>
+	        button.
               </para>
 	    </listitem>
 	  </varlistentry>
@@ -172,8 +174,9 @@ lack of time, resources, and interest.
          and a public event can be viewed by anyone on the calendar
          sharing network.  <guilabel>Private</guilabel> denotes one
          level of security, and <guilabel>Confidential</guilabel> a
-         higher level.  <!-- FIXME --> Exact determinations and implementations of
-         this feature have yet to be determined. <!-- FIXME -->
+         higher level.  <!-- FIXME --> Exact determinations and
+         implementations of this feature have yet to be
+         determined. <!-- FIXME -->
       </para>
       <para>
         The <guilabel>Recurrence</guilabel> tab lets you describe
@@ -262,10 +265,9 @@ lack of time, resources, and interest.
        calendar events.  Tasks are colored and sorted by priority and
        due-date (see <xref linkend="config-prefs"> for more
        information), and are included with calendar data during
-       synchronization with a hand-held device.  You can also use the
-       list in a larger format by choosing the
-       <guibutton>Tasks</guibutton> button in the shortcut bar or in
-       the folder tree.
+       synchronization with a hand-held device.  You can use the list
+       in a larger format by choosing the <guibutton>Tasks</guibutton>
+       button in the shortcut bar or in the folder tree.
     </para>
     <para>
        To record a new task, click the <guibutton>Add</guibutton>
@@ -315,9 +317,9 @@ lack of time, resources, and interest.
     </para>
     <para>
        Once you've added a task to your to-do list, its summary
-       appears in the <guilabel>Summary</guilabel> section of the
-       calendar window.  To view or edit a detailed description of an
-       item, double-click on it, or select it and click
+       appears in the <guilabel>Summary</guilabel> section of task
+       list.  To view or edit a detailed description of an item,
+       double-click on it, or select it and click
        <guibutton>Edit</guibutton>.  You can delete items by selecting
        them and clicking on the <guibutton>Delete</guibutton> button.
     </para>
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index 468997d4e1..3eecac7de7 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -105,10 +105,10 @@
       <para>
 	   Between <guilabel>Delete</guilabel> and <guilabel>View
     	   All</guilabel> is a quick search field. To use it, select
-    	   where you'd like to search in a card (The whole card, just
-    	   the name, or just the email address), then enter one or
-    	   more words you're looking for and press
-    	   <keycap>Enter</keycap>.
+    	   from the drop-down list which sort of search you'd like to
+    	   perform (the whole card, just the name, or just the email
+    	   address), then enter one or more words in the text entry
+    	   box, and press <keycap>Enter</keycap>.
     	   <application>Evolution</application> will search through
     	   the contents of every displayed card to find one that
     	   matches. You can refine searches by doing several in
@@ -131,7 +131,7 @@
          </para>
 	 <para>
 	    He opens his contacts folder, and runs a quick search for
-	    "Curtis;" there are eighteen different people with that name
+	    "Curtis." There are eighteen different people with that name
 	    in the file. He then enters "Sales," and
 	    <application>Evolution</application> narrows it down to the
 	    right Curtis. He only becomes annoyed when he discovers that
@@ -173,18 +173,13 @@
        cards selected, you'll delete multiple cards.
     </para>
     <para>
-       Adding or changing cards is slightly more complicated.  Any
-       time you add information to the address book, whether it's
-       an old card you're editing or a new card you're just adding to
-       your address book, you'll use the contact editor.  To change a
-       card that already exists, just double click it to open the
-       contact editor window with all the current information already
-       filled in.  If you want to create a new one, clicking the
-       <guibutton>New Card</guibutton> button will open up that same
-       window, but with empty fields instead of full ones.  Either
-       way, it's the same tool for quite similar tasks, and you'll
-       find that it's pretty flexible and can store quite a lot more
-       than you'd think would fit onto a file card.
+       If you want to add or change cards, you'll use the contact
+       editor.  To change a card that already exists, double click on
+       it to open the contact editor window with all the current
+       information already filled in.  If you want to create a new
+       one, clicking the <guibutton>New</guibutton> button in the
+       toolbar will open the same window, with blank entry boxes for
+       you to fill in.
     </para>
 
       <para>
@@ -192,35 +187,30 @@
     	<guilabel>General</guilabel>, for basic contact information,
     	and <guilabel>Details</guilabel>, for a more specific
     	description of the person.  In addition, it contains a
-    	<guimenu>File</guimenu> menu, covered in <xref
-    	linkend="menuref-contact-editor">, and a toolbar with three
+    	<guimenu>File</guimenu> menu, (see <xref
+    	linkend="menuref-contact-editor">) and a toolbar with three
     	items: <guilabel>Save and Close</guilabel>,
     	<guilabel>Print</guilabel>, and <guilabel>Delete</guilabel>.
-    	After that, however, it gets slightly more complicated, as you
-    	can see in <xref linkend="usage-contact-editor-fig">.
       </para>
       
       <figure id="usage-contact-editor-fig">
 	  <title>Evolution Contact Editor</title>
 	  <screenshot>
 	    <screeninfo>Evolution Contact Editor</screeninfo>
-	  <graphic fileref="fig/contact-editor" format="png" srccredit="Aaron Weber">
+	  <graphic fileref="fig/contact-editor.png" format="png" srccredit="Aaron Weber">
 		</graphic>
 	</screenshot>
       </figure>
       
-      <para> The <guilabel>General</guilabel> tab contains no less
-        than seven sections, each with an icon: a face, for name and
-        company; a telephone for phone numbers; an envelope for email
-        address; a globe for web page address; a house for postal
-        address; a file folder for contacts, and a briefcase for
-        categories.  You can guess what sort of information belongs in
-        fields like <guilabel>Job Title</guilabel> and <guilabel>Web
-        page address</guilabel>, but there are several parts of the
-        window that are a little more interesting.
+      <para> The <guilabel>General</guilabel> tab has seven sections,
+         each with an icon: a face, for name and company; a telephone
+         for phone numbers; an envelope for email address; a globe for
+         web page address; a house for postal address; a file folder
+         for contacts, and a briefcase for categories. 
     </para>
     <para>
      <variablelist>
+
 	<varlistentry>
 	  <term>Full Name</term>
 	  <listitem>
@@ -244,25 +234,25 @@
 		      <varlistentry>
 			<term><guilabel>First: </guilabel></term>
 			<listitem> <para>
-		             The person's first, or given, name.
+		            Enter the first, or given, name.
 			 </para></listitem> 
 		      </varlistentry>
 		      <varlistentry>
 			<term><guilabel>Middle: </guilabel></term>
 			<listitem> <para>
-			  The middle name or initial, if any, goes here.
+			  Enter the middle name or initial, if any.
 			</para></listitem>
 		      </varlistentry>
 		      <varlistentry>
 			<term><guilabel>Last: </guilabel></term>
 			<listitem> <para>
-			   The last name (surname) belongs here.
+			   Enter the last name (surname).
 			 </para></listitem>
 		      </varlistentry>
 		      <varlistentry>
 			<term><guilabel>Suffix: </guilabel></term>
 			<listitem> <para>
-			   Suffixes such as "Jr." or "III" can go here. 
+			   Enter suffixes such as "Jr." or "III."
 			</para></listitem>
 		      </varlistentry>
 		    </variablelist>
@@ -277,14 +267,14 @@
                   <para>
                     To see how it works, type a name in the
                     <guilabel>Full Name</guilabel> field:
-                    <userinput>Eva Lucianne Tester</userinput>.
-                    You'll notice that the <guilabel>File
-                    As</guilabel> field also fills up, but in reverse:
-                    <computeroutput>Tester, Eva</computeroutput>.
-                    You can pick <computeroutput>Eva
-                    Tester</computeroutput> from the drop-down, or
-                    type in your own, such as <userinput>Lucianne
-                    Tester, Eva</userinput>.
+                    <userinput>Rupert T. Monkey</userinput>.  You'll
+                    notice that the <guilabel>File As</guilabel> field
+                    also fills up, but in reverse:
+                    <computeroutput>Monkey, Rupert</computeroutput>.
+                    You can pick <computeroutput>Rupert Monkey
+                    </computeroutput> from the drop-down, or type in
+                    your own, such as <userinput> T. Rupert Monkey
+                    </userinput>.
                  </para>
 		  <tip>
 		    <title>Filing Suggestion</title>
@@ -292,8 +282,8 @@
 		    <para>
                       Don't enter something entirely different from
                       the actual name, since you might forget that
-                      you've filed Eva's information under "F" for
-                      "Fictitious Helix Code Employee."
+                      you've filed Rupert's information under "F" for
+                      "Fictitious Ximian Employee."
                     </para>
 		  </tip>
 		</listitem>
@@ -311,7 +301,7 @@
                 <guilabel>Email 3</guilabel>.  Although the contact
                 editor will only display one of those at any given
                 time, <application>Evolution</application> will
-                remember them all.  The arrow buttons next to the
+                store them all.  The arrow buttons next to the
                 telephone and postal address fields work in the same
                 way.
               </para>
@@ -321,8 +311,8 @@
      </para>
      <para>
       The last item in the <guilabel>General</guilabel> tab is the
-       <guilabel>Categories</guilabel> organization tool.  That's
-       really its own topic; for information on that, read <xref
+       <guilabel>Categories</guilabel> organization tool; for
+       information on that, read <xref
        linkend="usage-contact-organize">.
      </para>
      <para>
@@ -334,7 +324,7 @@
        for anything and everything else you'd like to note about them.
        If you ever wanted to have that uncanny knack for remembering
        obscure details like the date of someone's anniversary (perhaps
-       your own) this is the answer.
+       your own) this is the way to develop it.
      </para>
 
 
@@ -480,9 +470,9 @@
        contact information for your company or your department.  This
        is the sort of feature you'll want to use if your company has a
        list of vendors and clients that needs constant updating.  If
-       you also share your calendars, people can avoid duplicating
-       work and keep up to date on developments within their
-       work-group or across the entire company.
+       share calendars as well as address books, people can avoid
+       duplicating work and keep up to date on developments within
+       their work-group or across the entire company.
     </para>
 
      <example id="usage-contact-sharing-ex">
@@ -500,7 +490,7 @@
       </example>
     <para>
        Of course, you don't want to share all of your cards&mdash; why
-       overload the network with a list of babysitters, or tell
+       overload the network with a list of babysitters or tell
        everyone in the office you're talking to new job prospects?  If
        you keep cards on your own computer, you can decide which items
        you want to make accessible to others.
@@ -510,18 +500,23 @@
        contact folders, see <xref linkend="config-prefs-contact">.
        Once you have a connection, the network contacts folder or
        folders will appear inside the <guilabel>External
-       Directories</guilabel> folder in the folder bar, and will work
+       Directories</guilabel> folder in the folder bar.  It will work
        exactly like a local folder of cards, with the following
        exceptions:
        <itemizedlist>
 
-          <listitem><para>
-              They are only available when you are connected to the network.  If 
-              you use a laptop or have a modem connection, you may wish to copy or cache
-              the network directory and then synchronize your copy with the networked version
-              periodically.
-          </para></listitem>
-          <listitem><para>
+          <listitem>
+	  <para>
+              Network folders are only available when you are
+              connected to the network.  If you use a laptop or have a
+              modem connection, you may wish to copy or cache the
+              network directory and then synchronize your copy with
+              the networked version periodically.  <!-- FIXME: HOW? -->
+	  </para>
+	  </listitem>
+
+          <listitem>
+	  <para>
               To prevent excess network traffic,
               <application>Evolution</application> will not normally
               load the contents of LDAP folders immediately upon
@@ -529,15 +524,14 @@
               All</guilabel> before LDAP folder cards will be loaded
               from the network. You can change this behavior in the
               <interface>Contact Preferences</interface> window.
-          </para></listitem>
-	  <listitem><para>
-              Your ability to view, change, add or delete
-              contacts depends on the settings of the LDAP server.
-              For example, you may read all the entries in the public
-              Netcenter directory (available by default in the
-              <guilabel>External Directories</guilabel> folder), but
-              you may not change or delete any of them.
-           </para></listitem>
+          </para>
+	  </listitem>
+	  <listitem>
+	  <para>
+              Your ability to view, change, add, and delete contacts
+              depends on the settings of the LDAP server. 
+          </para>
+	  </listitem>
        </itemizedlist>
      </para>
   </sect1>
@@ -545,12 +539,12 @@
   <sect1 id="usage-contact-automate">
     <title>Address Book Tools</title>
     <para>
-       The address book works with
-       <application>Evolution</application> mail and the calendar to
-       help you add new address cards quickly.  However, it can also
-       manage mailing lists.  There are more tools planned, and when
-       they arrive, <!-- FIXME --> they will be described in this
-       section.
+       The address book works closely with
+       <application>Evolution</application>'s mail and calendar tools.
+       For example, you can use the address book to help you manage
+       mailing lists, and send or recieve address cards over email.
+       More tools are on the way, and when they arrive, <!-- FIXME -->
+       they will be described in this section.
     </para>
 
     <sect2 id="contact-automation-basic">
@@ -577,17 +571,21 @@
 	 addition to that, you can send email to everyone in a
 	 particular group if you choose.
       </para>
- <!-- FIXME this feature not yet implemented  -->
+
+ <!-- FIXME this feature not yet implemented 
+
       <para>
-         You can also use the address bookn to handle lists of
-	 postal addresses to print for labels.  Future versions of
+         You can also use the address book to print postal addresses
+	 on mailing labels.  Future versions of
 	 <application>Evolution</application> will allow you to you
 	 export a group of cards to a spreadsheet, database, or word
 	 processor so you can print address labels or prepare large
 	 mailings.
       </para>
+--->
+
     </sect2>
-<!--
+<!---  FIXME this feature not yet implemented 
     <sect2 id="usage-contact-automation-extra">
       <title>Map It!</title>
       <para>
@@ -599,6 +597,7 @@
     </sect2>
 -->
 
+
   </sect1>
 
 </chapter> 
diff --git a/doc/C/usage-exec-summary.sgml b/doc/C/usage-exec-summary.sgml
index 3cdb1a5cb6..5ff67029d7 100644
--- a/doc/C/usage-exec-summary.sgml
+++ b/doc/C/usage-exec-summary.sgml
@@ -1,21 +1,69 @@
 <chapter id="usage-exec-summary">
    <title>The Executive Summary</title>
     <para>
-      The Evolution Executive Summary is designed to show you a
-      summary of important information: the appointments for a given
-      day, important email, and so forth. To see your executive
-      summary, click on the <guibutton>Executive Summary</guibutton>
-      button in the shortcut bar, or select the
-      <guilabel>executive-summary</guilabel> in the folder bar.
-     </para>
-   <sect1 id="exec-intro">
-     <title>Introducing the Executive Summary</title>
-     <para>
-       The first thing you'll want to do with the executive summary is
-       add a service. Click the <guibutton>Add Service</guibutton>
-       button in the toolbar, then select one of the available
-       services.
+       The Evolution Executive Summary is designed to show you a
+       summary of important information: the appointments for a given
+       day, important email, and so forth. To see your executive
+       summary, click on the <guibutton>Executive Summary</guibutton>
+       button in the shortcut bar, or select the
+       <guilabel>executive-summary</guilabel> folder in the folder
+       bar.
+    </para>
+
+    <sect1 id="exec-intro">
+      <title>Introducing the Executive Summary</title>
+      <para>
+        The first thing you'll want to do with the executive summary
+        is add a service. Click the <guibutton>Add Service</guibutton>
+        button in the toolbar, 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>
+             <term>Calendar</term>
+             <listitem>
+               <para>
+                  Pending appointments and other events.
+               </para>
+             </listitem>
+           </varlistentry>
+
+          <varlistentry>
+             <term>Inbox</term>
+             <listitem>
+               <para>
+                 Information about your mail, such as the number of
+                 new messages you have waiting.
+               </para>
+             </listitem>
+           </varlistentry>
+
+          <varlistentry>
+             <term>To Do</term>
+             <listitem>
+               <para>
+                 A short summary of your task pad.
+               </para>
+             </listitem>
+           </varlistentry>
+
+          <varlistentry>
+             <term>RDF Summary</term>
+             <listitem>
+               <para>
+                  News headlines for any valid RDF file. The default
+                  is news about the GNOME project from <ulink
+                  url="www.gnome.org/gnome-news/">gnotices</ulink>.
+               </para>
+             </listitem>
+           </varlistentry>
+
+        </variablelist>
+
      </para>
+
      <para>
        Each service appears in a small box on the screen; you can
        remove the service by clicking the <guibutton>x</guibutton>
@@ -23,6 +71,16 @@
        clicking the little wrench icon below that.
      </para>
    </sect1>
+   <sect1 id="exec-services-detail">
+     <title>Services in Detail</title>
+      <para>
+          This section will show you how to use several
+          <application>Evolution</application> services. 
+
+      </para>
+     
+    </sect1>
+
 </chapter>
 
 
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index 409d63bf90..a2c14e99a6 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -33,16 +33,18 @@
        The toolbar offers you four different views of your calendar:
        one day, five days, a week, or a month at once. Press the
        calendar-shaped buttons on the right side of the toolbar to
-       switch between views. You can also select a range of days in
-       the small calendar at the upper right.
+       switch between views. You can also select a range of
+       days&mdash; three days, ten days, a fortnight if you want
+       &mdash; in the small calendar at the upper right.
     </para>
     <para>
-       To view yesterday's appointments, &mdash;last week's, if you're
-       in the weekly view, and last month's for the monthly
-       view&mdash; click the <guibutton>Prev</guibutton> button.  For
-       tomorrow, next week, or next month, click
-       <guibutton>Next</guibutton>.  Of course, click
-       <guibutton>Today</guibutton> for today.
+       The <guibutton>Prev</guibutton> and <guibutton>Next</guibutton>
+       buttons will move you forward and back in your calendar pages.
+       If you're looking at only one day, you'll see tomorrow's page,
+       or yesterday's.  If you're looking at your calendar by week,
+       month, fortnight, or anything else, you'll move around by just
+       that much. To come back to today's listing, click
+       <guibutton>Today</guibutton>.
     </para>
     <para>
        To visit a specific date's calendar entries, click
@@ -145,10 +147,10 @@ lack of time, resources, and interest.
 	    <term><guilabel>Program</guilabel></term>
 	    <listitem>
 	      <para>
-	        Select this if you would like some additional application
-	        to run as a reminder.  You can enter its name in the
-	        text field, or find it with the
-	        <guibutton>Browse</guibutton> button.
+	        Select this if you would like to run a program as a
+	        reminder.  You can enter its name in the text field,
+	        or find it with the <guibutton>Browse</guibutton>
+	        button.
               </para>
 	    </listitem>
 	  </varlistentry>
@@ -172,8 +174,9 @@ lack of time, resources, and interest.
          and a public event can be viewed by anyone on the calendar
          sharing network.  <guilabel>Private</guilabel> denotes one
          level of security, and <guilabel>Confidential</guilabel> a
-         higher level.  <!-- FIXME --> Exact determinations and implementations of
-         this feature have yet to be determined. <!-- FIXME -->
+         higher level.  <!-- FIXME --> Exact determinations and
+         implementations of this feature have yet to be
+         determined. <!-- FIXME -->
       </para>
       <para>
         The <guilabel>Recurrence</guilabel> tab lets you describe
@@ -262,10 +265,9 @@ lack of time, resources, and interest.
        calendar events.  Tasks are colored and sorted by priority and
        due-date (see <xref linkend="config-prefs"> for more
        information), and are included with calendar data during
-       synchronization with a hand-held device.  You can also use the
-       list in a larger format by choosing the
-       <guibutton>Tasks</guibutton> button in the shortcut bar or in
-       the folder tree.
+       synchronization with a hand-held device.  You can use the list
+       in a larger format by choosing the <guibutton>Tasks</guibutton>
+       button in the shortcut bar or in the folder tree.
     </para>
     <para>
        To record a new task, click the <guibutton>Add</guibutton>
@@ -315,9 +317,9 @@ lack of time, resources, and interest.
     </para>
     <para>
        Once you've added a task to your to-do list, its summary
-       appears in the <guilabel>Summary</guilabel> section of the
-       calendar window.  To view or edit a detailed description of an
-       item, double-click on it, or select it and click
+       appears in the <guilabel>Summary</guilabel> section of task
+       list.  To view or edit a detailed description of an item,
+       double-click on it, or select it and click
        <guibutton>Edit</guibutton>.  You can delete items by selecting
        them and clicking on the <guibutton>Delete</guibutton> button.
     </para>
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index 468997d4e1..3eecac7de7 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -105,10 +105,10 @@
       <para>
 	   Between <guilabel>Delete</guilabel> and <guilabel>View
     	   All</guilabel> is a quick search field. To use it, select
-    	   where you'd like to search in a card (The whole card, just
-    	   the name, or just the email address), then enter one or
-    	   more words you're looking for and press
-    	   <keycap>Enter</keycap>.
+    	   from the drop-down list which sort of search you'd like to
+    	   perform (the whole card, just the name, or just the email
+    	   address), then enter one or more words in the text entry
+    	   box, and press <keycap>Enter</keycap>.
     	   <application>Evolution</application> will search through
     	   the contents of every displayed card to find one that
     	   matches. You can refine searches by doing several in
@@ -131,7 +131,7 @@
          </para>
 	 <para>
 	    He opens his contacts folder, and runs a quick search for
-	    "Curtis;" there are eighteen different people with that name
+	    "Curtis." There are eighteen different people with that name
 	    in the file. He then enters "Sales," and
 	    <application>Evolution</application> narrows it down to the
 	    right Curtis. He only becomes annoyed when he discovers that
@@ -173,18 +173,13 @@
        cards selected, you'll delete multiple cards.
     </para>
     <para>
-       Adding or changing cards is slightly more complicated.  Any
-       time you add information to the address book, whether it's
-       an old card you're editing or a new card you're just adding to
-       your address book, you'll use the contact editor.  To change a
-       card that already exists, just double click it to open the
-       contact editor window with all the current information already
-       filled in.  If you want to create a new one, clicking the
-       <guibutton>New Card</guibutton> button will open up that same
-       window, but with empty fields instead of full ones.  Either
-       way, it's the same tool for quite similar tasks, and you'll
-       find that it's pretty flexible and can store quite a lot more
-       than you'd think would fit onto a file card.
+       If you want to add or change cards, you'll use the contact
+       editor.  To change a card that already exists, double click on
+       it to open the contact editor window with all the current
+       information already filled in.  If you want to create a new
+       one, clicking the <guibutton>New</guibutton> button in the
+       toolbar will open the same window, with blank entry boxes for
+       you to fill in.
     </para>
 
       <para>
@@ -192,35 +187,30 @@
     	<guilabel>General</guilabel>, for basic contact information,
     	and <guilabel>Details</guilabel>, for a more specific
     	description of the person.  In addition, it contains a
-    	<guimenu>File</guimenu> menu, covered in <xref
-    	linkend="menuref-contact-editor">, and a toolbar with three
+    	<guimenu>File</guimenu> menu, (see <xref
+    	linkend="menuref-contact-editor">) and a toolbar with three
     	items: <guilabel>Save and Close</guilabel>,
     	<guilabel>Print</guilabel>, and <guilabel>Delete</guilabel>.
-    	After that, however, it gets slightly more complicated, as you
-    	can see in <xref linkend="usage-contact-editor-fig">.
       </para>
       
       <figure id="usage-contact-editor-fig">
 	  <title>Evolution Contact Editor</title>
 	  <screenshot>
 	    <screeninfo>Evolution Contact Editor</screeninfo>
-	  <graphic fileref="fig/contact-editor" format="png" srccredit="Aaron Weber">
+	  <graphic fileref="fig/contact-editor.png" format="png" srccredit="Aaron Weber">
 		</graphic>
 	</screenshot>
       </figure>
       
-      <para> The <guilabel>General</guilabel> tab contains no less
-        than seven sections, each with an icon: a face, for name and
-        company; a telephone for phone numbers; an envelope for email
-        address; a globe for web page address; a house for postal
-        address; a file folder for contacts, and a briefcase for
-        categories.  You can guess what sort of information belongs in
-        fields like <guilabel>Job Title</guilabel> and <guilabel>Web
-        page address</guilabel>, but there are several parts of the
-        window that are a little more interesting.
+      <para> The <guilabel>General</guilabel> tab has seven sections,
+         each with an icon: a face, for name and company; a telephone
+         for phone numbers; an envelope for email address; a globe for
+         web page address; a house for postal address; a file folder
+         for contacts, and a briefcase for categories. 
     </para>
     <para>
      <variablelist>
+
 	<varlistentry>
 	  <term>Full Name</term>
 	  <listitem>
@@ -244,25 +234,25 @@
 		      <varlistentry>
 			<term><guilabel>First: </guilabel></term>
 			<listitem> <para>
-		             The person's first, or given, name.
+		            Enter the first, or given, name.
 			 </para></listitem> 
 		      </varlistentry>
 		      <varlistentry>
 			<term><guilabel>Middle: </guilabel></term>
 			<listitem> <para>
-			  The middle name or initial, if any, goes here.
+			  Enter the middle name or initial, if any.
 			</para></listitem>
 		      </varlistentry>
 		      <varlistentry>
 			<term><guilabel>Last: </guilabel></term>
 			<listitem> <para>
-			   The last name (surname) belongs here.
+			   Enter the last name (surname).
 			 </para></listitem>
 		      </varlistentry>
 		      <varlistentry>
 			<term><guilabel>Suffix: </guilabel></term>
 			<listitem> <para>
-			   Suffixes such as "Jr." or "III" can go here. 
+			   Enter suffixes such as "Jr." or "III."
 			</para></listitem>
 		      </varlistentry>
 		    </variablelist>
@@ -277,14 +267,14 @@
                   <para>
                     To see how it works, type a name in the
                     <guilabel>Full Name</guilabel> field:
-                    <userinput>Eva Lucianne Tester</userinput>.
-                    You'll notice that the <guilabel>File
-                    As</guilabel> field also fills up, but in reverse:
-                    <computeroutput>Tester, Eva</computeroutput>.
-                    You can pick <computeroutput>Eva
-                    Tester</computeroutput> from the drop-down, or
-                    type in your own, such as <userinput>Lucianne
-                    Tester, Eva</userinput>.
+                    <userinput>Rupert T. Monkey</userinput>.  You'll
+                    notice that the <guilabel>File As</guilabel> field
+                    also fills up, but in reverse:
+                    <computeroutput>Monkey, Rupert</computeroutput>.
+                    You can pick <computeroutput>Rupert Monkey
+                    </computeroutput> from the drop-down, or type in
+                    your own, such as <userinput> T. Rupert Monkey
+                    </userinput>.
                  </para>
 		  <tip>
 		    <title>Filing Suggestion</title>
@@ -292,8 +282,8 @@
 		    <para>
                       Don't enter something entirely different from
                       the actual name, since you might forget that
-                      you've filed Eva's information under "F" for
-                      "Fictitious Helix Code Employee."
+                      you've filed Rupert's information under "F" for
+                      "Fictitious Ximian Employee."
                     </para>
 		  </tip>
 		</listitem>
@@ -311,7 +301,7 @@
                 <guilabel>Email 3</guilabel>.  Although the contact
                 editor will only display one of those at any given
                 time, <application>Evolution</application> will
-                remember them all.  The arrow buttons next to the
+                store them all.  The arrow buttons next to the
                 telephone and postal address fields work in the same
                 way.
               </para>
@@ -321,8 +311,8 @@
      </para>
      <para>
       The last item in the <guilabel>General</guilabel> tab is the
-       <guilabel>Categories</guilabel> organization tool.  That's
-       really its own topic; for information on that, read <xref
+       <guilabel>Categories</guilabel> organization tool; for
+       information on that, read <xref
        linkend="usage-contact-organize">.
      </para>
      <para>
@@ -334,7 +324,7 @@
        for anything and everything else you'd like to note about them.
        If you ever wanted to have that uncanny knack for remembering
        obscure details like the date of someone's anniversary (perhaps
-       your own) this is the answer.
+       your own) this is the way to develop it.
      </para>
 
 
@@ -480,9 +470,9 @@
        contact information for your company or your department.  This
        is the sort of feature you'll want to use if your company has a
        list of vendors and clients that needs constant updating.  If
-       you also share your calendars, people can avoid duplicating
-       work and keep up to date on developments within their
-       work-group or across the entire company.
+       share calendars as well as address books, people can avoid
+       duplicating work and keep up to date on developments within
+       their work-group or across the entire company.
     </para>
 
      <example id="usage-contact-sharing-ex">
@@ -500,7 +490,7 @@
       </example>
     <para>
        Of course, you don't want to share all of your cards&mdash; why
-       overload the network with a list of babysitters, or tell
+       overload the network with a list of babysitters or tell
        everyone in the office you're talking to new job prospects?  If
        you keep cards on your own computer, you can decide which items
        you want to make accessible to others.
@@ -510,18 +500,23 @@
        contact folders, see <xref linkend="config-prefs-contact">.
        Once you have a connection, the network contacts folder or
        folders will appear inside the <guilabel>External
-       Directories</guilabel> folder in the folder bar, and will work
+       Directories</guilabel> folder in the folder bar.  It will work
        exactly like a local folder of cards, with the following
        exceptions:
        <itemizedlist>
 
-          <listitem><para>
-              They are only available when you are connected to the network.  If 
-              you use a laptop or have a modem connection, you may wish to copy or cache
-              the network directory and then synchronize your copy with the networked version
-              periodically.
-          </para></listitem>
-          <listitem><para>
+          <listitem>
+	  <para>
+              Network folders are only available when you are
+              connected to the network.  If you use a laptop or have a
+              modem connection, you may wish to copy or cache the
+              network directory and then synchronize your copy with
+              the networked version periodically.  <!-- FIXME: HOW? -->
+	  </para>
+	  </listitem>
+
+          <listitem>
+	  <para>
               To prevent excess network traffic,
               <application>Evolution</application> will not normally
               load the contents of LDAP folders immediately upon
@@ -529,15 +524,14 @@
               All</guilabel> before LDAP folder cards will be loaded
               from the network. You can change this behavior in the
               <interface>Contact Preferences</interface> window.
-          </para></listitem>
-	  <listitem><para>
-              Your ability to view, change, add or delete
-              contacts depends on the settings of the LDAP server.
-              For example, you may read all the entries in the public
-              Netcenter directory (available by default in the
-              <guilabel>External Directories</guilabel> folder), but
-              you may not change or delete any of them.
-           </para></listitem>
+          </para>
+	  </listitem>
+	  <listitem>
+	  <para>
+              Your ability to view, change, add, and delete contacts
+              depends on the settings of the LDAP server. 
+          </para>
+	  </listitem>
        </itemizedlist>
      </para>
   </sect1>
@@ -545,12 +539,12 @@
   <sect1 id="usage-contact-automate">
     <title>Address Book Tools</title>
     <para>
-       The address book works with
-       <application>Evolution</application> mail and the calendar to
-       help you add new address cards quickly.  However, it can also
-       manage mailing lists.  There are more tools planned, and when
-       they arrive, <!-- FIXME --> they will be described in this
-       section.
+       The address book works closely with
+       <application>Evolution</application>'s mail and calendar tools.
+       For example, you can use the address book to help you manage
+       mailing lists, and send or recieve address cards over email.
+       More tools are on the way, and when they arrive, <!-- FIXME -->
+       they will be described in this section.
     </para>
 
     <sect2 id="contact-automation-basic">
@@ -577,17 +571,21 @@
 	 addition to that, you can send email to everyone in a
 	 particular group if you choose.
       </para>
- <!-- FIXME this feature not yet implemented  -->
+
+ <!-- FIXME this feature not yet implemented 
+
       <para>
-         You can also use the address bookn to handle lists of
-	 postal addresses to print for labels.  Future versions of
+         You can also use the address book to print postal addresses
+	 on mailing labels.  Future versions of
 	 <application>Evolution</application> will allow you to you
 	 export a group of cards to a spreadsheet, database, or word
 	 processor so you can print address labels or prepare large
 	 mailings.
       </para>
+--->
+
     </sect2>
-<!--
+<!---  FIXME this feature not yet implemented 
     <sect2 id="usage-contact-automation-extra">
       <title>Map It!</title>
       <para>
@@ -599,6 +597,7 @@
     </sect2>
 -->
 
+
   </sect1>
 
 </chapter> 
diff --git a/help/C/usage-exec-summary.sgml b/help/C/usage-exec-summary.sgml
index 3cdb1a5cb6..5ff67029d7 100644
--- a/help/C/usage-exec-summary.sgml
+++ b/help/C/usage-exec-summary.sgml
@@ -1,21 +1,69 @@
 <chapter id="usage-exec-summary">
    <title>The Executive Summary</title>
     <para>
-      The Evolution Executive Summary is designed to show you a
-      summary of important information: the appointments for a given
-      day, important email, and so forth. To see your executive
-      summary, click on the <guibutton>Executive Summary</guibutton>
-      button in the shortcut bar, or select the
-      <guilabel>executive-summary</guilabel> in the folder bar.
-     </para>
-   <sect1 id="exec-intro">
-     <title>Introducing the Executive Summary</title>
-     <para>
-       The first thing you'll want to do with the executive summary is
-       add a service. Click the <guibutton>Add Service</guibutton>
-       button in the toolbar, then select one of the available
-       services.
+       The Evolution Executive Summary is designed to show you a
+       summary of important information: the appointments for a given
+       day, important email, and so forth. To see your executive
+       summary, click on the <guibutton>Executive Summary</guibutton>
+       button in the shortcut bar, or select the
+       <guilabel>executive-summary</guilabel> folder in the folder
+       bar.
+    </para>
+
+    <sect1 id="exec-intro">
+      <title>Introducing the Executive Summary</title>
+      <para>
+        The first thing you'll want to do with the executive summary
+        is add a service. Click the <guibutton>Add Service</guibutton>
+        button in the toolbar, 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>
+             <term>Calendar</term>
+             <listitem>
+               <para>
+                  Pending appointments and other events.
+               </para>
+             </listitem>
+           </varlistentry>
+
+          <varlistentry>
+             <term>Inbox</term>
+             <listitem>
+               <para>
+                 Information about your mail, such as the number of
+                 new messages you have waiting.
+               </para>
+             </listitem>
+           </varlistentry>
+
+          <varlistentry>
+             <term>To Do</term>
+             <listitem>
+               <para>
+                 A short summary of your task pad.
+               </para>
+             </listitem>
+           </varlistentry>
+
+          <varlistentry>
+             <term>RDF Summary</term>
+             <listitem>
+               <para>
+                  News headlines for any valid RDF file. The default
+                  is news about the GNOME project from <ulink
+                  url="www.gnome.org/gnome-news/">gnotices</ulink>.
+               </para>
+             </listitem>
+           </varlistentry>
+
+        </variablelist>
+
      </para>
+
      <para>
        Each service appears in a small box on the screen; you can
        remove the service by clicking the <guibutton>x</guibutton>
@@ -23,6 +71,16 @@
        clicking the little wrench icon below that.
      </para>
    </sect1>
+   <sect1 id="exec-services-detail">
+     <title>Services in Detail</title>
+      <para>
+          This section will show you how to use several
+          <application>Evolution</application> services. 
+
+      </para>
+     
+    </sect1>
+
 </chapter>