Minor Changes.

2001-02-08  Aaron Weber  <aaron@helixcode.com>

	* C/usage-contact.sgml: Minor Changes.

	* C/usage-mail.sgml: Minor Changes.

2001-02-07  Aaron Weber  <aaron@helixcode.com>

	* C/menuref.sgml: Added section, but left blank til UI stabilizes.

	* C/usage-exec-summary.sgml: A little functionality described.

	* C/usage-mainwindow.sgml: Added tasks and Exec-summary.

	* C/usage-calendar.sgml: Describe semi-autonomy of task pad.

svn path=/trunk/; revision=8114

7 files changed, 168 insertions, 108 deletions

diff --git a/help/C/menuref.sgml b/help/C/menuref.sgml
index c1f6e31c1c..77dc66c1d5 100644
--- a/help/C/menuref.sgml
+++ b/help/C/menuref.sgml
@@ -168,6 +168,15 @@
     </sect2>
   </sect1>
 
+  <sect1 id="menuref-exec">
+   <title>Executive Summary Menus</title>
+   <para>
+     We'll leave this section blank until the UI stabilizes a little
+     more.
+   <para>
+  </sect1>
+
+
 
   <sect1 id="menuref-mail">
     <title>Mail Menus</title>
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index 0c6165f80e..8bcda744d0 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -258,7 +258,10 @@ 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.
+       synchronization with a hand-held device.  You can also see 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>
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index 4f7cb098ef..468997d4e1 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -73,19 +73,19 @@
          </para></listitem>
 	
 	<listitem><para>
-	    Press <guibutton>Print</guibutton> to print one or more cards.
+	    <guibutton>Print</guibutton> sends one or more of your cards to the printer.
 	</para></listitem>
         <listitem><para>
            <guibutton>Delete</guibutton> deletes a selected card.
         </para></listitem>
 
-        <listitem><para> <guibutton>View All</guibutton> Displays all
+        <listitem><para> <guibutton>View All</guibutton> displays all
            the address information in the folder.  Use this button to
            refresh the display for a network folder, or to switch from
            viewing the results of a search and see the whole contents.
            </para></listitem>
 
-        <listitem><para> <guibutton>Stop</guibutton> Stop loading
+        <listitem><para> <guibutton>Stop</guibutton> stops loading
            contact data from the network.  This button is only
            relevant if you are looking at contact information on a
            network.  </para></listitem>
@@ -93,10 +93,7 @@
     </para>
 
     <para>
-       Your contact information fills the rest of the display. By
-       default, <application>Evolution</application> shows it as a set
-       of small address cards, but you can set it to appear as a table
-       with the options in the <guimenu>View</guimenu> menu. Move
+       Your contact information fills the rest of the display.  Move
        through the cards alphabetically with the buttons and the
        scrollbar at the right of the window. Of course, if you have
        more than a few people listed, you'll want some way of finding
@@ -107,24 +104,22 @@
       <title>Searching for Contacts</title>
       <para>
 	   Between <guilabel>Delete</guilabel> and <guilabel>View
-    	   All</guilabel> is <guilabel>Quick Search</guilabel>. To use
-    	   it, just type in one or more words you're looking for and
-    	   hit <keycap>Enter</keycap>.
+    	   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>.
     	   <application>Evolution</application> will search through
     	   the contents of every displayed card to find one that
-    	   matches. In other words, you can refine searches by doing
-    	   several in succession.
+    	   matches. You can refine searches by doing several in
+    	   succession, or start over by pressing the <guibutton>View
+    	   All</guibutton> button.
 	</para>
       <para>
 	   If there are no matches, the card display will be
 	   blank. When you'd like to see all the cards again, press
 	   <guilabel>Show All</guilabel>.
- <!--  **************************************************
-           If you're sneaky, you can
-	   enter a blank search &mdash; every contact has at least one
-	   space in it, so you'll display them all. NOTE: This may not actually work.
- ******  -->
-      </para>
+       </para>
       <example id="contact-quicksearch-ex">
 	<title>Refining a Quick Search</title>
 	<para>
@@ -148,10 +143,10 @@
         If you prefer to perform a more complex search, press
         <guibutton>Find</guibutton> or choose
         <menuchoice><guimenu>Tools</guimenu><guimenuitem>Search for
-        Contact</guimenuitem></menuchoice>. This will open the in-depth search window, which
-        lets you use multiple search criteria in the same way that
-        email filters and <glossterm linkend="vfolder">vFolders</glossterm> do..
-      </para>    
+        Contact</guimenuitem></menuchoice>. This will open the
+        in-depth search window, which lets you use multiple search
+        criteria in the same way that email filters and <glossterm
+        linkend="vfolder">virtual folders</glossterm> do..  </para>
       <para>
         Click <guibutton>Add Criterion</guibutton> to increase the
         number of criteria you'd like to use in the search, and
@@ -174,8 +169,8 @@
     <title>Destroy, Create, and Change: The Contact Editor</title>
     <para>
        To delete a card, click on it once to select it, then press the
-       <guibutton>Delete Card</guibutton> button.  If you have
-       multiple cards selected, you'll delete multiple cards.
+       <guibutton>Delete</guibutton> button.  If you have multiple
+       cards selected, you'll delete multiple cards.
     </para>
     <para>
        Adding or changing cards is slightly more complicated.  Any
diff --git a/help/C/usage-exec-summary.sgml b/help/C/usage-exec-summary.sgml
index dad0ad253b..2b16ffa98d 100644
--- a/help/C/usage-exec-summary.sgml
+++ b/help/C/usage-exec-summary.sgml
@@ -11,7 +11,16 @@
    <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.
+     </para>
+     <para>
+       Each service appears in a small box on the screen; you can
+       remove the service by clicking the <guibutton>x</guibutton>
+       button in the upper right, or bring up a settings dialog by
+       clicking the little wrench icon below that.
      </para>
-
    </sect1>
 </chapter>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 994e8cbae8..7fabfed099 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -103,6 +103,14 @@
          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>Take a look at the headers</title>
+	 <para>
+	 To look at the entire source of your email message, including
+	 all the header information, select
+	 <menuchoice><guimenu>View</guimenu><guimenuitem>Source</guimenu></menuchoice>
+	 </para>
+	 </tip>
        </para>
 
       <sect3 id="usage-mail-listorder">
@@ -1004,9 +1012,9 @@ possibly never will be due to security evil. -->
 	  </varlistentry>
 	</variablelist>
 
-        Then, press <keycap>Enter</keycap>.
-        <application>Evolution</application> will show your search
-        results in the message list.
+        When you've entered your search phrase, press
+        <keycap>Enter</keycap>.  <application>Evolution</application>
+        will show your search results in the message list.
 
       </para>
     </sect2>
@@ -1029,14 +1037,13 @@ possibly never will be due to security evil. -->
         Most often, you'll want to have
         <application>Evolution</application> put mail into different
         folders, but you can have it do almost anything you like.
-        People who subscribe to multiple mailing lists, or who often
-        need to refer to messages they have sent, find filters
-        especially helpful to separate personal from list-related
-        mail, but they're good for anybody who gets more than a few
-        messages a day.  To create a filter, open the
-        <interface>filter assistant</interface> by selecting
+        People who get lots of mail, or who often need to refer to old
+        messages, find filters especially helpful, but they're good
+        for anybody who gets more than a few messages a day.  To
+        create a filter, open the <interface>filter
+        assistant</interface> by selecting
 	<menuchoice>
-	  <guimenu>Tools</guimenu> 
+	  <guimenu>Settings</guimenu> 
           <guimenuitem>Mail Filters</guimenuitem>
         </menuchoice>.
       </para>
@@ -1055,8 +1062,8 @@ possibly never will be due to security evil. -->
         list of your current filters, sorted by the order in which
         they are used.  From the drop-down box at the top of the
         window, choose <guilabel>Incoming</guilabel> to display
-        filters for incoming mail, and <guilabel>On Demand</guilabel>
-        for those which sort your mail only when you want.
+        filters for incoming mail, and <guilabel>Outgoing</guilabel>
+        for those which sort only outgoing mail.
       </para>
       <para>
          The <interface>filter assistant</interface> also has a set of
@@ -1086,15 +1093,15 @@ possibly never will be due to security evil. -->
         </itemizedlist>
 
         If you don't have any filters set up, the only one of those
-        buttons you can click is <guibutton>Add</guibutton>.  When you
-        do that, (or when you click <guibutton>Edit</guibutton> with a
-        filter selected), the <interface>Add Rule</interface> window
-        appears.
+        buttons you can click is <guibutton>Add</guibutton>, which
+        will open a dialog to let you add a filter rule.  If you do
+        have filters, you can either add a new filter rule, or select
+        one from your list and click <guibutton>Edit</guibutton>.
       </para>
       <para>
-        That window, shown in <xref
+        The filter rule editor, shown in <xref
         linkend="usage-mail-filters-fig-new">, is where you'll
-        actually create your filtering rule.  
+        actually create your filtering rule.
 
        <figure id="usage-mail-filters-fig-new">
 	 <title>Creating a new Filter</title>
@@ -1107,8 +1114,9 @@ possibly never will be due to security evil. -->
       </para>
       <para>
         Enter a name for your filter in the <guilabel>Rule
-        Name</guilabel> field, and then begin choosing criteria.
-        Choose how many criteria you'd like by pressing <guibutton>Add
+        Name</guilabel> field, and then begin choosing the criteria
+        you'd like to use as you sort your mail.  Choose how many
+        criteria you'd like by pressing <guibutton>Add
         Criterion</guibutton> and <guibutton>Remove
         Criterion</guibutton>.  If you have multiple criteria, you
         should then decide whether to have the filter do its job only
@@ -1143,45 +1151,46 @@ possibly never will be due to security evil. -->
 
 	  <varlistentry>
 	    <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 text you'd like to find
-	     inside it.  </para></listitem>
+	    <listitem><para>
+              The filter can look at any header you
+	      want, even obscure or custom ones. Enter the header name
+	      in the first text box, and put your search text in the
+	      second one.
+            </para></listitem>
 	  </varlistentry>
 
 	  <varlistentry>
 	    <term><guilabel>Message Body</guilabel></term>
 	    <listitem><para>
-                The actual text of the message.
+                Search in the actual text of the message.
             </para></listitem>
 	  </varlistentry>
 
 	  <varlistentry>
 	    <term><guilabel>Expression</guilabel></term>
-	    <listitem><para> Enter a <glossterm
-	    linkend="regular-expression">regular
-	    expression</glossterm>, and
-	    <application>Evolution</application> will search the
-	    entire message, headers and all, to match it for you.
-	    </para></listitem>
+	    <listitem>
+             <para>
+               Enter a <glossterm linkend="regular-expression">regular
+	       expression</glossterm>, and
+	       <application>Evolution</application> will search the
+	       entire message, including headers, to match it for you.
+	     </para>
+           </listitem>
 	  </varlistentry>
 
 
 	  <varlistentry>
 	    <term><guilabel>Date Sent</guilabel></term>
-	    <listitem><para>
-                You can filter messages by when they were sent: First,
-                choose how you'd like to match the time&mdash;
-                <guilabel>before</guilabel>,
-                <guilabel>after</guilabel> and so forth.  Then, choose
-                the time. The filter compare the message's time-stamp
-                to the system clock when the filter is run, or to a
-                specific time and date you choose from a calendar.
-                You can even have it look for messages within a range
-                of time relative to the filter.  For example, you could have
-                the filter catch all messages sent less
-                than a week before the filter is run.
-            </para></listitem>
+	    <listitem><para> Filter messages by when they were sent:
+	    First, choose the conditions you want a message to
+	    meet&mdash; <guilabel>before</guilabel> a given time,
+	    <guilabel>after</guilabel> it, and so forth.  Then, choose
+	    the time. The filter will compare the message's time-stamp
+	    to the system clock when the filter is run, or to a
+	    specific time and date you choose from a calendar.  You
+	    can even have it look for messages within a range of time
+	    relative to the filter&mdash perhaps you're looking for
+	    messages less than two days old.  </para></listitem>
 	  </varlistentry>
 
 	  <varlistentry>
@@ -1208,27 +1217,30 @@ possibly never will be due to security evil. -->
 	    <listitem>
               <para>
                 If you know your way around a <glossterm
-  	        linkend="regular-expression">regex </glossterm>, or
-  	        regular expression, put your knowledge to use
-  	        here.
-               </para>
+  	        linkend="regular-expression">regex</glossterm>, or
+  	        regular expression, put your knowledge to use here.
+  	       </para>
             </listitem>
           </varlistentry>
 
 	  <varlistentry>
 	    <term><guilabel>Source</guilabel></term>
-	    <listitem><para>
-               Filter messages according the server you got them from.  You can enter a URL or
-               choose one from the drop-down list.  This criterion is only relevant if you
-               use more than one mail source.
-            </para></listitem>
+	    <listitem>
+               <para>
+               Filter messages according the server you got them from.
+               You can enter a URL or choose one from the drop-down
+               list.  This ability is only relevant if you use more
+               than one mail source.
+             </para>
+            </listitem>
 	  </varlistentry>
 	</variablelist>
       </para>
         <para>
-        Now, tell it what to do with those messages.  If you want multiple
-        actions, click <guibutton>Add Action</guibutton>; if you want fewer,
-        click <guibutton>Remove Action</guibutton>.  And choose again:
+        Now, tell it what to do with those messages.  If you want more
+        actions, click <guibutton>Add Action</guibutton>; if you want
+        fewer, click <guibutton>Remove Action</guibutton>.  And choose
+        again:
         <variablelist>
 
 	  <varlistentry>
@@ -1372,7 +1384,7 @@ possibly never will be due to security evil. -->
       <para>
 	As messages that meet the virtual folder criteria arrive or are
 	deleted, <application>Evolution</application> will
-	automatically place them in and and remove them from the
+	automatically place them in and remove them from the
 	virtual folder contents list.  When you delete a message, it gets
 	erased from the folder in which it actually exists, as well as
 	any virtual folders which display it.
@@ -1384,7 +1396,7 @@ possibly never will be due to security evil. -->
 	changing groups of faculty, staff, administrators and
 	students.  The more mail you need to organize, the less you
 	can afford the sort of confusion that stems from an
-	organizational system that's not flexible enough.  virtual folders
+	organizational system that's not flexible enough.  Virtual folders
 	make for better organization because they can accept
 	overlapping groups in a way that regular folders and filing
 	systems can't.
@@ -1393,17 +1405,17 @@ possibly never will be due to security evil. -->
       <example id="usage-mail-organize-vFolders-ex">
 	<title>Using Folders, Searches, and Virtual Folders</title>
 	<para>
-	   To organize my mail box, I set up a virtual folder for emails from
-	   my friend and co-worker Anna.  I have another one for
-	   messages from anybody at work that have "Evolution" in the
-	   subject line, so I can keep a record of what people from
-	   work send me about <application>Evolution</application>.
-	   If Anna sends a message about a picnic on Saturday, it only
-	   shows up in the "Anna" folder. When Anna sends me mail
-	   about the user interface for
-	   <application>Evolution</application>, I can see that
-	   message both in the "Anna" virtual folder and in the "Internal
-	   Evolution Discussion" virtual folder.
+	   To organize my mail box, I set up a virtual folder for
+	   emails from my friend and co-worker Anna.  I have another
+	   one for messages that have "ximian.com" in the address and
+	   "Evolution" in the subject line, so I can keep a record of
+	   what people from work send me about
+	   <application>Evolution</application>.  If Anna sends me a
+	   message about anything other than Evolution, it only shows
+	   up in the "Anna" folder. When Anna sends me mail about the
+	   user interface for <application>Evolution</application>, I
+	   can see that message both in the "Anna" virtual folder and
+	   in the "Internal Evolution Discussion" virtual folder.
 	</para>
       </example>
 
@@ -1411,7 +1423,7 @@ possibly never will be due to security evil. -->
 
       <para>
 	 To create a virtual folder, select <menuchoice>
-	 <guimenu>Tools</guimenu> <guimenuitem>Virtual Folder
+	 <guimenu>Settings</guimenu> <guimenuitem>Virtual Folder
 	 Editor</guimenuitem> </menuchoice>.  This will bring up a
 	 dialog box that looks suspiciously like the filter window
 	 (for more information on filters, see <xref
@@ -1421,7 +1433,7 @@ possibly never will be due to security evil. -->
 	 here, and you can select, edit or remove them if you wish.
 	 If you have not created any, there will be only one available
 	 option: click <guibutton>Add</guibutton> to add a new
-	 vFolder.
+	 Virtual Folder.
       </para>
       <para>
 	 You can enter a name for your virtual folder in the
@@ -1437,7 +1449,7 @@ possibly never will be due to security evil. -->
        </para>
        <para>
          The second part, however, is slightly different.  In the
-         section of the window labelled <guilabel>vFolder Sources
+         section of the window labelled <guilabel>Virtual Folder Sources
          </guilabel> is a list of folders in which
          <application>Evolution</application> will search for the
          contents of your vFolder.  Click <guibutton>Add</guibutton>
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 54607c8c01..bbcb2b5a39 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -107,6 +107,20 @@
       </varlistentry>
 -->
 
+
+	<varlistentry>
+	  <term> <guibutton>Executive Summary:</guibutton></term>
+	  <listitem>
+	    <para>
+	      Start your day here.  The Executive summary gives you
+              lists of new or important messages, daily appointments
+              and urgent tasks.  You can customize its appearance and
+              content, and use it to access Evolution services.
+	    </para>
+	  </listitem>
+	</varlistentry>
+
+
 	<varlistentry>
 	  <term> <guibutton>Inbox:</guibutton></term>
 	  <listitem>
@@ -130,6 +144,15 @@
 	  </listitem>
 	</varlistentry>
 
+       <varlistentry>
+         <term><guibutton>Tasks:</guibutton></term>
+	<listitem>
+	  <para>
+	     A full-size view of your calendar's task pad.
+	  </para>
+	</listitem>
+      </varlistentry>
+
 	<varlistentry>
 	  <term><guibutton>Contacts:</guibutton></term>
 	  <listitem>
@@ -143,15 +166,7 @@
 	</varlistentry>
 
 <!-- NOT IMPLEMENTED YET
-       <varlistentry>
-	<listitem>
-	  <para>
-	     The <guibutton>Tasks:</guibutton> tool combines a "to
-	     do" list with reminders to help you keep track of
-	     daily events.
-	  </para>
-	</listitem>
-      </varlistentry>
+
 
 	<varlistentry>
 	  <term> <guibutton>Notes:</guibutton></term>
diff --git a/help/ChangeLog b/help/ChangeLog
index 76eae8ead5..fdcb46140d 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,8 +1,25 @@
+2001-02-08  Aaron Weber  <aaron@helixcode.com>
+
+	* C/usage-contact.sgml: Minor Changes.
+
+	* C/usage-mail.sgml: Minor Changes.
+
+2001-02-07  Aaron Weber  <aaron@helixcode.com>
+
+	* C/menuref.sgml: Added section, but left blank til UI stabilizes.
+
+	* C/usage-exec-summary.sgml: A little functionality described.
+
+	* C/usage-mainwindow.sgml: Added tasks and Exec-summary.
+
+	* C/usage-calendar.sgml: Describe semi-autonomy of task pad.
+
 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.
+	* C/usage-exec-summary.sgml: New file. Describes Executive Summary.
 	
 2001-01-19  Aaron Weber  <aaron@helixcode.com>