s/contact manager/address book/ and revised text.

2001-02-06 Aaron Weber <aaron@ximian.com>
	* C/usage-contact.sgml: s/contact manager/address book/ and
	revised text.

	*C/usage-exec-summary.sgml: New file. Describes Executive Summary.

svn path=/trunk/; revision=8053

10 files changed, 138 insertions, 94 deletions

diff --git a/doc/C/evolution-guide.sgml b/doc/C/evolution-guide.sgml
index dc2f5046aa..b14b9ef355 100644
--- a/doc/C/evolution-guide.sgml
+++ b/doc/C/evolution-guide.sgml
@@ -2,6 +2,7 @@
 
 <!ENTITY PREFACE SYSTEM "preface.sgml">
 <!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.sgml">
+<!ENTITY USAGE-EXEC-SUMMARY SYSTEM "usage-exec-summary.sgml">
 <!ENTITY USAGE-MAIL SYSTEM "usage-mail.sgml">
 <!ENTITY USAGE-CONTACT SYSTEM "usage-contact.sgml">
 <!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.sgml">
@@ -85,6 +86,7 @@ implemented. -->
     </partintro>
 
     &USAGE-MAINWINDOW;
+    &USAGE-EXEC-SUMMARY;
     &USAGE-MAIL;
     &USAGE-CONTACT;
     &USAGE-CALENDAR;
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index e1fa058fd8..4f7cb098ef 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -3,10 +3,10 @@
 -->
 
 <chapter id="usage-contact">
-  <title>The Evolution Contact Manager</title>
+  <title>The Evolution Address Book</title>
   <abstract>
     <para>
-      The <application>Evolution</application> contact manager can
+      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
@@ -19,32 +19,31 @@
     </para>
     <para>
       Another advantage of the <application>Evolution</application>
-      contact manager 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 get an e-mail with contact information in
-      it and create a new address card on the spot.  In addition,
-      searches and folders work in the same way they do in the
-      other components.
+      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 Evolution.
     </para>
     <para>
-      This chapter will cover using the
-      <application>Evolution</application> contact manager to organize
+      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 contact manager, see <xref
+      learn about configuring the address book, see <xref
       linkend="config-prefs-contact">.
     </para>
   </abstract>
   <sect1 id="usage-contact-basic">
-    <title>Getting Started With the Contact Manager</title>	
+    <title>Getting Started With the Address Book</title>	
     
     <para>
        To open up 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 Contact Manager in all
-       its organizational glory.  By default, the contact manager
+       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> format.  You can select
        other views from the <guimenu>View</guimenu> menu, and adjust
@@ -54,9 +53,9 @@
 
 
     <figure id="usage-contact-fig">
-      <title>Evolution Contact Manager</title>
+      <title>Evolution Address Book</title>
       <screenshot>
-	<screeninfo>Evolution Contact Manager Window</screeninfo>
+	<screeninfo>Evolution Address Book Window</screeninfo>
 	<graphic fileref="fig/contact" format="png" srccredit="Aaron Weber">
 	    </graphic>
       </screenshot>
@@ -66,7 +65,7 @@
        The toolbar for the address book is quite simple:
        <itemizedlist>
 	<listitem><para>
-           Press <guibutton>New</guibutton> for a new contact.
+           <guibutton>New</guibutton> creates a new card.
 	</para></listitem>
 
 	<listitem><para>
@@ -180,7 +179,7 @@
     </para>
     <para>
        Adding or changing cards is slightly more complicated.  Any
-       time you add information to the contact manager, whether it's
+       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
@@ -377,11 +376,11 @@
   </sect1>
 
   <sect1 id="usage-contact-organize">
-    <title>Organizing your Contact Manager</title>
+    <title>Organizing your Address Book</title>
     <para>
-       Organizing your contact manager is a lot like organizing your
+       Organizing your address book is a lot like organizing your
        mail.  You can have folders and searches the same way you can
-       with mail, but the contact manager does not allow vFolders.  It
+       with mail, but the address book does not allow vFolders.  It
        does, however, allow each card to fall under several
        categories, and allow you to create your own categories.  To
        learn about categories, read <xref
@@ -392,7 +391,7 @@
     <para>
       Another useful <application>Evolution</application> feature is
       its ability to recognize when people live or work together.  If
-      several people in your contact manager share an address, and you
+      several people in your address book share an address, and you
       change the address for one of them,
       <application>Evolution</application> will ask you if you wish to
       change the address for all of them, or just for one.
@@ -549,9 +548,9 @@
   </sect1>
 
   <sect1 id="usage-contact-automate">
-    <title>Contact Manager Tools</title>
+    <title>Address Book Tools</title>
     <para>
-       The contact manager works with
+       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
@@ -579,13 +578,13 @@
 	 You already know that when you are writing an email, you can
 	 address it to one or more people, and that
 	 <application>Evolution</application> will fill in addresses
-	 from your contact manager's address cards if you let it.  In
+	 from your address book's address cards if you let it.  In
 	 addition to that, you can send email to everyone in a
 	 particular group if you choose.
       </para>
  <!-- FIXME this feature not yet implemented  -->
       <para>
-         You can also use the contact manager to handle lists of
+         You can also use the address bookn to handle lists of
 	 postal addresses to print for labels.  Future versions of
 	 <application>Evolution</application> will allow you to you
 	 export a group of cards to a spreadsheet, database, or word
diff --git a/doc/C/usage-exec-summary.sgml b/doc/C/usage-exec-summary.sgml
new file mode 100644
index 0000000000..dad0ad253b
--- /dev/null
+++ b/doc/C/usage-exec-summary.sgml
@@ -0,0 +1,17 @@
+<chapter="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>
+     </para>
+
+   </sect1>
+</chapter>
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 70fdc76d66..994e8cbae8 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -475,9 +475,7 @@ with quoted materials and the relevant replies interspersed-->
 	   <guibutton>Reply</guibutton>.  If there are large numbers
 	   of people in the <guilabel>Cc:</guilabel> or
 	   <guilabel>To:</guilabel> fields, this can save substantial
-	   amounts of time.  Be careful: always make sure you know who
-	   is getting a message: one address could be a mailing list
-	   with thousands of subscribers.
+	   amounts of time. 
 	  <example>
 	    <title>Using the Reply to All feature</title>
 	    <para>
@@ -488,8 +486,8 @@ with quoted materials and the relevant replies interspersed-->
 	      just wants to tell Susan that he agrees with her, he
 	      uses <guibutton>Reply</guibutton>.  Note that his reply
 	      will not reach anyone that Susan put on her
-	      <guilabel>Bcc</guilabel> list, since nobody else knows
-	      that they got that message.
+	      <guilabel>Bcc</guilabel> list, since that list is not
+	      shared with anyone.
 	    </para>
 	  </example>
 	</para>
@@ -862,16 +860,16 @@ possibly never will be due to security evil. -->
     <sect2 id="usage-mail-organize-columns">
       <title>Sorting Mail with Column Headers</title>
       <para>
-         By default, the columns in a mail message list are: an
-         envelope icon indicating whether you have read or replied to
-         a message (closed for unread, open for read, and open with an
-         arrow on it to indicate you've sent a reply), an exclamation
-         point indicating priority, and the <guilabel>From</guilabel>,
-         <guilabel>Subject</guilabel>, and <guilabel>Date</guilabel>
-         fields. You can change their order and remove them by
-         dragging and dropping them.  You can add new ones with the
-         <guimenuitem>Field Chooser</guimenuitem> item in the right
-         click menu for the column headings.
+         By default, the message list has columns with the following
+         headings: an envelope icon indicating whether you have read
+         or replied to a message (closed for unread, open for read,
+         and open with an arrow on it to indicate you've sent a
+         reply), an exclamation point indicating priority, and the
+         <guilabel>From</guilabel>, <guilabel>Subject</guilabel>, and
+         <guilabel>Date</guilabel> fields. You can change their order
+         and remove them by dragging and dropping them.  You can add
+         new ones with the <guimenuitem>Field Chooser</guimenuitem>
+         item in the right click menu for the column headings.
       </para>
       <para>
          Right-click on one of the column headers to get a list of
@@ -1118,13 +1116,13 @@ possibly never will be due to security evil. -->
         any criteria are met</guilabel>.
      </para>
      <para>
-        For each of your filter criteria, you must first select what
-        part of the message you want the filter to look at:
+        For each filter criterion, you must first select what
+        part of the message you want the filter to examine:
         <variablelist>
 	  <varlistentry>
 	    <term><guilabel>Sender</guilabel></term>
 	    <listitem><para>
-                The author of the message.
+                The sender's address.
             </para></listitem>
 	  </varlistentry>
 
@@ -1147,8 +1145,8 @@ possibly never will be due to security evil. -->
 	    <term><guilabel>Specific Header</guilabel></term>
 	    <listitem><para> The filter can look at any header you
 	    want, even obscure or custom ones like X-Bonus or
-	    X-Archive. Enter the header name, and what you'd like to
-	    match inside it.  </para></listitem>
+	    X-Archive. Enter the header name, and what text you'd like to find
+	     inside it.  </para></listitem>
 	  </varlistentry>
 
 	  <varlistentry>
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 51d8d6eb7c..76eae8ead5 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-06 Aaron Weber <aaron@ximian.com>
+	* C/usage-contact.sgml: s/contact manager/address book/ and
+	revised text.
+
+	*C/usage-exec-summary.sgml: New file. Describes Executive Summary.
+	
 2001-01-19  Aaron Weber  <aaron@helixcode.com>
 
 	* C/usage-mail.sgml: More of Megan's revisions, and Field Chooser
diff --git a/help/C/evolution-guide.sgml b/help/C/evolution-guide.sgml
index dc2f5046aa..b14b9ef355 100644
--- a/help/C/evolution-guide.sgml
+++ b/help/C/evolution-guide.sgml
@@ -2,6 +2,7 @@
 
 <!ENTITY PREFACE SYSTEM "preface.sgml">
 <!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.sgml">
+<!ENTITY USAGE-EXEC-SUMMARY SYSTEM "usage-exec-summary.sgml">
 <!ENTITY USAGE-MAIL SYSTEM "usage-mail.sgml">
 <!ENTITY USAGE-CONTACT SYSTEM "usage-contact.sgml">
 <!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.sgml">
@@ -85,6 +86,7 @@ implemented. -->
     </partintro>
 
     &USAGE-MAINWINDOW;
+    &USAGE-EXEC-SUMMARY;
     &USAGE-MAIL;
     &USAGE-CONTACT;
     &USAGE-CALENDAR;
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index e1fa058fd8..4f7cb098ef 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -3,10 +3,10 @@
 -->
 
 <chapter id="usage-contact">
-  <title>The Evolution Contact Manager</title>
+  <title>The Evolution Address Book</title>
   <abstract>
     <para>
-      The <application>Evolution</application> contact manager can
+      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
@@ -19,32 +19,31 @@
     </para>
     <para>
       Another advantage of the <application>Evolution</application>
-      contact manager 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 get an e-mail with contact information in
-      it and create a new address card on the spot.  In addition,
-      searches and folders work in the same way they do in the
-      other components.
+      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 Evolution.
     </para>
     <para>
-      This chapter will cover using the
-      <application>Evolution</application> contact manager to organize
+      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 contact manager, see <xref
+      learn about configuring the address book, see <xref
       linkend="config-prefs-contact">.
     </para>
   </abstract>
   <sect1 id="usage-contact-basic">
-    <title>Getting Started With the Contact Manager</title>	
+    <title>Getting Started With the Address Book</title>	
     
     <para>
        To open up 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 Contact Manager in all
-       its organizational glory.  By default, the contact manager
+       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> format.  You can select
        other views from the <guimenu>View</guimenu> menu, and adjust
@@ -54,9 +53,9 @@
 
 
     <figure id="usage-contact-fig">
-      <title>Evolution Contact Manager</title>
+      <title>Evolution Address Book</title>
       <screenshot>
-	<screeninfo>Evolution Contact Manager Window</screeninfo>
+	<screeninfo>Evolution Address Book Window</screeninfo>
 	<graphic fileref="fig/contact" format="png" srccredit="Aaron Weber">
 	    </graphic>
       </screenshot>
@@ -66,7 +65,7 @@
        The toolbar for the address book is quite simple:
        <itemizedlist>
 	<listitem><para>
-           Press <guibutton>New</guibutton> for a new contact.
+           <guibutton>New</guibutton> creates a new card.
 	</para></listitem>
 
 	<listitem><para>
@@ -180,7 +179,7 @@
     </para>
     <para>
        Adding or changing cards is slightly more complicated.  Any
-       time you add information to the contact manager, whether it's
+       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
@@ -377,11 +376,11 @@
   </sect1>
 
   <sect1 id="usage-contact-organize">
-    <title>Organizing your Contact Manager</title>
+    <title>Organizing your Address Book</title>
     <para>
-       Organizing your contact manager is a lot like organizing your
+       Organizing your address book is a lot like organizing your
        mail.  You can have folders and searches the same way you can
-       with mail, but the contact manager does not allow vFolders.  It
+       with mail, but the address book does not allow vFolders.  It
        does, however, allow each card to fall under several
        categories, and allow you to create your own categories.  To
        learn about categories, read <xref
@@ -392,7 +391,7 @@
     <para>
       Another useful <application>Evolution</application> feature is
       its ability to recognize when people live or work together.  If
-      several people in your contact manager share an address, and you
+      several people in your address book share an address, and you
       change the address for one of them,
       <application>Evolution</application> will ask you if you wish to
       change the address for all of them, or just for one.
@@ -549,9 +548,9 @@
   </sect1>
 
   <sect1 id="usage-contact-automate">
-    <title>Contact Manager Tools</title>
+    <title>Address Book Tools</title>
     <para>
-       The contact manager works with
+       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
@@ -579,13 +578,13 @@
 	 You already know that when you are writing an email, you can
 	 address it to one or more people, and that
 	 <application>Evolution</application> will fill in addresses
-	 from your contact manager's address cards if you let it.  In
+	 from your address book's address cards if you let it.  In
 	 addition to that, you can send email to everyone in a
 	 particular group if you choose.
       </para>
  <!-- FIXME this feature not yet implemented  -->
       <para>
-         You can also use the contact manager to handle lists of
+         You can also use the address bookn to handle lists of
 	 postal addresses to print for labels.  Future versions of
 	 <application>Evolution</application> will allow you to you
 	 export a group of cards to a spreadsheet, database, or word
diff --git a/help/C/usage-exec-summary.sgml b/help/C/usage-exec-summary.sgml
new file mode 100644
index 0000000000..dad0ad253b
--- /dev/null
+++ b/help/C/usage-exec-summary.sgml
@@ -0,0 +1,17 @@
+<chapter="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>
+     </para>
+
+   </sect1>
+</chapter>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 70fdc76d66..994e8cbae8 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -475,9 +475,7 @@ with quoted materials and the relevant replies interspersed-->
 	   <guibutton>Reply</guibutton>.  If there are large numbers
 	   of people in the <guilabel>Cc:</guilabel> or
 	   <guilabel>To:</guilabel> fields, this can save substantial
-	   amounts of time.  Be careful: always make sure you know who
-	   is getting a message: one address could be a mailing list
-	   with thousands of subscribers.
+	   amounts of time. 
 	  <example>
 	    <title>Using the Reply to All feature</title>
 	    <para>
@@ -488,8 +486,8 @@ with quoted materials and the relevant replies interspersed-->
 	      just wants to tell Susan that he agrees with her, he
 	      uses <guibutton>Reply</guibutton>.  Note that his reply
 	      will not reach anyone that Susan put on her
-	      <guilabel>Bcc</guilabel> list, since nobody else knows
-	      that they got that message.
+	      <guilabel>Bcc</guilabel> list, since that list is not
+	      shared with anyone.
 	    </para>
 	  </example>
 	</para>
@@ -862,16 +860,16 @@ possibly never will be due to security evil. -->
     <sect2 id="usage-mail-organize-columns">
       <title>Sorting Mail with Column Headers</title>
       <para>
-         By default, the columns in a mail message list are: an
-         envelope icon indicating whether you have read or replied to
-         a message (closed for unread, open for read, and open with an
-         arrow on it to indicate you've sent a reply), an exclamation
-         point indicating priority, and the <guilabel>From</guilabel>,
-         <guilabel>Subject</guilabel>, and <guilabel>Date</guilabel>
-         fields. You can change their order and remove them by
-         dragging and dropping them.  You can add new ones with the
-         <guimenuitem>Field Chooser</guimenuitem> item in the right
-         click menu for the column headings.
+         By default, the message list has columns with the following
+         headings: an envelope icon indicating whether you have read
+         or replied to a message (closed for unread, open for read,
+         and open with an arrow on it to indicate you've sent a
+         reply), an exclamation point indicating priority, and the
+         <guilabel>From</guilabel>, <guilabel>Subject</guilabel>, and
+         <guilabel>Date</guilabel> fields. You can change their order
+         and remove them by dragging and dropping them.  You can add
+         new ones with the <guimenuitem>Field Chooser</guimenuitem>
+         item in the right click menu for the column headings.
       </para>
       <para>
          Right-click on one of the column headers to get a list of
@@ -1118,13 +1116,13 @@ possibly never will be due to security evil. -->
         any criteria are met</guilabel>.
      </para>
      <para>
-        For each of your filter criteria, you must first select what
-        part of the message you want the filter to look at:
+        For each filter criterion, you must first select what
+        part of the message you want the filter to examine:
         <variablelist>
 	  <varlistentry>
 	    <term><guilabel>Sender</guilabel></term>
 	    <listitem><para>
-                The author of the message.
+                The sender's address.
             </para></listitem>
 	  </varlistentry>
 
@@ -1147,8 +1145,8 @@ possibly never will be due to security evil. -->
 	    <term><guilabel>Specific Header</guilabel></term>
 	    <listitem><para> The filter can look at any header you
 	    want, even obscure or custom ones like X-Bonus or
-	    X-Archive. Enter the header name, and what you'd like to
-	    match inside it.  </para></listitem>
+	    X-Archive. Enter the header name, and what text you'd like to find
+	     inside it.  </para></listitem>
 	  </varlistentry>
 
 	  <varlistentry>
diff --git a/help/ChangeLog b/help/ChangeLog
index 51d8d6eb7c..76eae8ead5 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-06 Aaron Weber <aaron@ximian.com>
+	* C/usage-contact.sgml: s/contact manager/address book/ and
+	revised text.
+
+	*C/usage-exec-summary.sgml: New file. Describes Executive Summary.
+	
 2001-01-19  Aaron Weber  <aaron@helixcode.com>
 
 	* C/usage-mail.sgml: More of Megan's revisions, and Field Chooser