A couple changes to Kevin's update. Mostly just checking over.

2001-06-19  Aaron Weber  <aaron@ximian.com>

	* C/usage-mainwindow.sgml and usage-mail.sgml: A couple changes to Kevin's update. Mostly just checking over.

svn path=/trunk/; revision=10313

4 files changed, 52 insertions, 50 deletions

diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 2d8959b5d6..50228d7f44 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -1213,10 +1213,9 @@ possibly never will be due to security evil. -->
 	    <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, including headers, to match it for you.
+               For programmers only: match a message according to an
+               expression you write in the Scheme language, used to
+               define filters in Evolution.
 	     </para>
            </listitem>
 	  </varlistentry>
@@ -1224,16 +1223,17 @@ possibly never will be due to security evil. -->
 
 	  <varlistentry>
 	    <term><guilabel>Date Sent</guilabel></term>
-	    <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>
+	    <listitem><para> Filter messages according to the date on
+	    which 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>
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
index 7f5957ffb2..90e66b8453 100644
--- a/doc/C/usage-mainwindow.sgml
+++ b/doc/C/usage-mainwindow.sgml
@@ -85,19 +85,20 @@
       </para>
       </listitem>
       </varlistentry>
-
+-->
 	<varlistentry>
-	  <term> <guibutton>Executive Summary:</guibutton></term>
+	  <term> <guibutton>My Evolution</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.
+	      Start your day here.  <guilabel>My Evolution</guilabel>
+              gives you a quick summary 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>
@@ -408,10 +409,10 @@
         <varlistentry>
           <term> <guimenu>Actions</guimenu></term>
           <listitem><para>
-	    Holds actions which maybe applied to a message.
-	    Normally, if there is only one target for the
-            action(example: reply to message), then the
-            action will be in here.
+	    Holds actions which maybe applied to a message.  Normally,
+	    if there is only one target for the action &mdash; for
+	    example, replying to a message &mdash; you can find it in
+	    the <guimenu>Actions</guimenu> menu.
           </para></listitem>
         </varlistentry>
 
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 2d8959b5d6..50228d7f44 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -1213,10 +1213,9 @@ possibly never will be due to security evil. -->
 	    <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, including headers, to match it for you.
+               For programmers only: match a message according to an
+               expression you write in the Scheme language, used to
+               define filters in Evolution.
 	     </para>
            </listitem>
 	  </varlistentry>
@@ -1224,16 +1223,17 @@ possibly never will be due to security evil. -->
 
 	  <varlistentry>
 	    <term><guilabel>Date Sent</guilabel></term>
-	    <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>
+	    <listitem><para> Filter messages according to the date on
+	    which 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>
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 7f5957ffb2..90e66b8453 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -85,19 +85,20 @@
       </para>
       </listitem>
       </varlistentry>
-
+-->
 	<varlistentry>
-	  <term> <guibutton>Executive Summary:</guibutton></term>
+	  <term> <guibutton>My Evolution</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.
+	      Start your day here.  <guilabel>My Evolution</guilabel>
+              gives you a quick summary 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>
@@ -408,10 +409,10 @@
         <varlistentry>
           <term> <guimenu>Actions</guimenu></term>
           <listitem><para>
-	    Holds actions which maybe applied to a message.
-	    Normally, if there is only one target for the
-            action(example: reply to message), then the
-            action will be in here.
+	    Holds actions which maybe applied to a message.  Normally,
+	    if there is only one target for the action &mdash; for
+	    example, replying to a message &mdash; you can find it in
+	    the <guimenu>Actions</guimenu> menu.
           </para></listitem>
         </varlistentry>