Editing

2001-07-09  Kevin Breit  <battery841@mediaone.net>

	* C/usage-exec-summary.sgml: Editing

	* C/usage-mail.sgml: Editing

	* C/usage-mail-org.sgml: Editing

	* C/usage-calendar.sgml: Editing

	* C/usage-contact.sgml: Editing

svn path=/trunk/; revision=10931

12 files changed, 104 insertions, 78 deletions

diff --git a/doc/C/preface.sgml b/doc/C/preface.sgml
index 67779dc0af..35925b0e26 100644
--- a/doc/C/preface.sgml
+++ b/doc/C/preface.sgml
@@ -217,8 +217,7 @@
     
     <para>
       The <guilabel>Shortcut Bar</guilabel> lets you go to your favorite
-      components with a click of a button.  You can even add your favorite
-      folders to the <guilabel>Shortcut Bar</guilabel>.
+      components with the click of a click of a button.  
     </para>
     
     <para>
@@ -228,7 +227,7 @@
     
     <para>
       Periodically, <application>Evolution</application> will need to quietly
-      display a message, or tell you the progress of something.  This most
+      display a message, or tell you the progress of a task.  This most
       often happens when you're checking or sending email.  These progress
       queues are shown here, in the <guilabel>Status Bar</guilabel>.  
     </para>
@@ -279,6 +278,13 @@
       you're coming from a Unix program, you're probably using mbox.  Ask your
       system administrator if you aren't sure which you use.
     </para>
+    <note>
+      <title>Eudora</title>
+      <para>
+	Eudora email client uses mbox format to store mail.  So if you're coming
+	from Eudora, you'll want to select mbox.
+      </para>
+    </note>
     <para>
       To import your files, go to
       <menuchoice>
@@ -552,7 +558,8 @@
 		  </listitem>
 		  <listitem>
 		    <para>
-		      Double-click on the contact's card.
+		      Double-click on the contact's card and enter details about
+		      the person.
 		    </para>
 		  </listitem>
 		</itemizedlist>
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index f6dde4a5b0..781c3e8286 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -297,10 +297,7 @@
 	  any email address or message, and choose
 	  <guimenuitem>Create Card for this Address</guimenuitem> or
 	  <guimenuitem>Create Card for this Sender</guimenuitem>
-            from the menu.  While looking at a calendar appointment,
-	  right-click any email address, and choose
-	  <guimenuitem>Create Card for this Address</guimenuitem>.
-	  (NOTE that feature may change!  unimplemented!)
+	  from the menu.
 	</para>
       </tip>
     </para>
diff --git a/doc/C/usage-exec-summary.sgml b/doc/C/usage-exec-summary.sgml
index cccf6c409f..1abeafe588 100644
--- a/doc/C/usage-exec-summary.sgml
+++ b/doc/C/usage-exec-summary.sgml
@@ -101,7 +101,7 @@
     <sect2 id="delete-components">
       <title>Deleting Components</title>
       <para>
-	Of course, there are possibly some components which you'd prefer not too
+	There are possibly some components which you'd prefer not too
 	view in your My Evolution.
 	To remove a component:
 	<orderedlist numeration="arabic">
diff --git a/doc/C/usage-mail-org.sgml b/doc/C/usage-mail-org.sgml
index 7518d74270..31c9b93684 100644
--- a/doc/C/usage-mail-org.sgml
+++ b/doc/C/usage-mail-org.sgml
@@ -320,7 +320,7 @@
 		    Size (kb) - Sorts based on the size of the message in kilobytes.
 		  </para>
 		</listitem>
-		
+		          <itemizedlist>
 		<listitem>
 		  <para>
 		    Status - Filters according to the status of a message, such as
@@ -362,18 +362,14 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Select the criterion for the condition.
-	</para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      If you want multiple criterion for this filter, press <guibutton>Add
-	    criterion</guibutton> and repeat the previous step.
+	      Select the criterion for the condition.   If you want multiple
+	      criterion for this filter, press <guibutton>Add
+		criterion</guibutton> and repeat the previous step.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	  Select the actions for the filter in the <guilabel>Then</guilabel>
+	      Select the actions for the filter in the <guilabel>Then</guilabel>
 	      section.  You can select any of the following options.
 	      <itemizedlist>
 		<listitem><para>
@@ -555,21 +551,19 @@
 	systems can't.
       </para>
 
-      <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 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 id="usage-mail-organize-vFolders-ex">
+      <title>Using Folders, Searches, and Virtual Folders</title>
+      <para>
+	To organize their mailbox, Jim sets up a virtual volder for emails from
+	his friend and co-worker Anna.  He has another one for messages that
+	have ximian.com in the address and Evolution in the subject line, so he
+	can keep a record of what people from work send him about
+	<application>evolution</application>.  If Anna sends him a message about
+	anything other than Evolution, it only shows up in the "Anna" folder.
+	When Anna sends him mail about the user interface for
+	<application>evolution</application>, he can see that message both in
+	the "Anna" virtual folder and in the "Internal Evolution Discussion"
+	virtual folder.
       </example>
 
 	<!--  (INSERT SCREENSHOT HERE: virtual folders in action) -->
@@ -760,7 +754,7 @@
       </para>
     </sect2>
     <sect2 id="usage-mail-vfolder-unmatched">
-      <title>Unmatched vFolder</title>
+      <title>The Unmatched vFolder</title>
       <para>
 	Obveously, not all messages will fit into all your vFolders.  That is
 	what the UNMATCHED vFolder is for.  The UNMATCHED vFolder is a vFolder
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 628cade7b8..8a6c379868 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -41,7 +41,7 @@
       mail. There's also the <application>Evolution</application>
       <link linkend="usage-mail-organize-vFolders">Virtual
       Folder</link>, an advanced organizational feature not found in
-      many other mail clients.  If you get a lot of mail, or if you keep
+      mainstream mail clients.  If you get a lot of mail, or if you keep
       every message you get in case you need to refer to it later,
       you'll find this feature especially useful.
     </para>
@@ -98,7 +98,7 @@
     </para>
     
     <para>
-      The <guilabel>Email List</guilabel> lists off all the emails that you
+      The <guilabel>Email List</guilabel> displays all the emails that you
       have.  This includes all your read, unread, and email that is flagged 
       to be deleted.
     </para>
@@ -665,7 +665,7 @@ with quoted materials and the relevant replies interspersed-->
           use the <guibutton>Reply to List</guibutton> instead of the standard
           <guibutton>Reply</guibutton> or <guibutton>Reply to All</guibutton>.
           <note>
-            <title>Whats a Mailing List?</title>
+            <title>What is a Mailing List?</title>
             <para>
               Mailing Lists are one of the most popular ways in which group
               collaboration on the Internet works.  They allow people to send one
@@ -1015,8 +1015,7 @@ with quoted materials and the relevant replies interspersed-->
       <sect2 id="usage-mail-getnsend-ettiquette">
         <title>Seven Tips for Email Courtesy</title>
         <para>
-          I started with ten, but four were "Don't send
-          <glossterm linkend="spam">spam</glossterm>."
+
           <itemizedlist>
 
             <listitem>
@@ -1064,6 +1063,12 @@ with quoted materials and the relevant replies interspersed-->
 	      much, not too little.
 	    </para>
 	  </listitem>
+
+	  <listitem>
+	    <para>
+	      Don't send <glossterm linkend="spam">spam</glossterm>.
+	    </para>
+	  </listitem>
 	</itemizedlist>
       </para>
       <para> Happy mailing! </para>
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 08d3496759..764f5b5d96 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,15 @@
 2001-07-09  Kevin Breit  <battery841@mediaone.net>
 
+	* C/usage-exec-summary.sgml: Editing
+
+	* C/usage-mail.sgml: Editing
+
+	* C/usage-mail-org.sgml: Editing
+
+	* C/usage-calendar.sgml: Editing
+
+	* C/usage-contact.sgml: Editing
+
 	* C/usage-mail-org.sgml: Mention UNMATCHED
 
 	* C/usage-mail.sgml: Commented on trash being a vFolder
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index 67779dc0af..35925b0e26 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -217,8 +217,7 @@
     
     <para>
       The <guilabel>Shortcut Bar</guilabel> lets you go to your favorite
-      components with a click of a button.  You can even add your favorite
-      folders to the <guilabel>Shortcut Bar</guilabel>.
+      components with the click of a click of a button.  
     </para>
     
     <para>
@@ -228,7 +227,7 @@
     
     <para>
       Periodically, <application>Evolution</application> will need to quietly
-      display a message, or tell you the progress of something.  This most
+      display a message, or tell you the progress of a task.  This most
       often happens when you're checking or sending email.  These progress
       queues are shown here, in the <guilabel>Status Bar</guilabel>.  
     </para>
@@ -279,6 +278,13 @@
       you're coming from a Unix program, you're probably using mbox.  Ask your
       system administrator if you aren't sure which you use.
     </para>
+    <note>
+      <title>Eudora</title>
+      <para>
+	Eudora email client uses mbox format to store mail.  So if you're coming
+	from Eudora, you'll want to select mbox.
+      </para>
+    </note>
     <para>
       To import your files, go to
       <menuchoice>
@@ -552,7 +558,8 @@
 		  </listitem>
 		  <listitem>
 		    <para>
-		      Double-click on the contact's card.
+		      Double-click on the contact's card and enter details about
+		      the person.
 		    </para>
 		  </listitem>
 		</itemizedlist>
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index f6dde4a5b0..781c3e8286 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -297,10 +297,7 @@
 	  any email address or message, and choose
 	  <guimenuitem>Create Card for this Address</guimenuitem> or
 	  <guimenuitem>Create Card for this Sender</guimenuitem>
-            from the menu.  While looking at a calendar appointment,
-	  right-click any email address, and choose
-	  <guimenuitem>Create Card for this Address</guimenuitem>.
-	  (NOTE that feature may change!  unimplemented!)
+	  from the menu.
 	</para>
       </tip>
     </para>
diff --git a/help/C/usage-exec-summary.sgml b/help/C/usage-exec-summary.sgml
index cccf6c409f..1abeafe588 100644
--- a/help/C/usage-exec-summary.sgml
+++ b/help/C/usage-exec-summary.sgml
@@ -101,7 +101,7 @@
     <sect2 id="delete-components">
       <title>Deleting Components</title>
       <para>
-	Of course, there are possibly some components which you'd prefer not too
+	There are possibly some components which you'd prefer not too
 	view in your My Evolution.
 	To remove a component:
 	<orderedlist numeration="arabic">
diff --git a/help/C/usage-mail-org.sgml b/help/C/usage-mail-org.sgml
index 7518d74270..31c9b93684 100644
--- a/help/C/usage-mail-org.sgml
+++ b/help/C/usage-mail-org.sgml
@@ -320,7 +320,7 @@
 		    Size (kb) - Sorts based on the size of the message in kilobytes.
 		  </para>
 		</listitem>
-		
+		          <itemizedlist>
 		<listitem>
 		  <para>
 		    Status - Filters according to the status of a message, such as
@@ -362,18 +362,14 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Select the criterion for the condition.
-	</para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      If you want multiple criterion for this filter, press <guibutton>Add
-	    criterion</guibutton> and repeat the previous step.
+	      Select the criterion for the condition.   If you want multiple
+	      criterion for this filter, press <guibutton>Add
+		criterion</guibutton> and repeat the previous step.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	  Select the actions for the filter in the <guilabel>Then</guilabel>
+	      Select the actions for the filter in the <guilabel>Then</guilabel>
 	      section.  You can select any of the following options.
 	      <itemizedlist>
 		<listitem><para>
@@ -555,21 +551,19 @@
 	systems can't.
       </para>
 
-      <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 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 id="usage-mail-organize-vFolders-ex">
+      <title>Using Folders, Searches, and Virtual Folders</title>
+      <para>
+	To organize their mailbox, Jim sets up a virtual volder for emails from
+	his friend and co-worker Anna.  He has another one for messages that
+	have ximian.com in the address and Evolution in the subject line, so he
+	can keep a record of what people from work send him about
+	<application>evolution</application>.  If Anna sends him a message about
+	anything other than Evolution, it only shows up in the "Anna" folder.
+	When Anna sends him mail about the user interface for
+	<application>evolution</application>, he can see that message both in
+	the "Anna" virtual folder and in the "Internal Evolution Discussion"
+	virtual folder.
       </example>
 
 	<!--  (INSERT SCREENSHOT HERE: virtual folders in action) -->
@@ -760,7 +754,7 @@
       </para>
     </sect2>
     <sect2 id="usage-mail-vfolder-unmatched">
-      <title>Unmatched vFolder</title>
+      <title>The Unmatched vFolder</title>
       <para>
 	Obveously, not all messages will fit into all your vFolders.  That is
 	what the UNMATCHED vFolder is for.  The UNMATCHED vFolder is a vFolder
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 628cade7b8..8a6c379868 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -41,7 +41,7 @@
       mail. There's also the <application>Evolution</application>
       <link linkend="usage-mail-organize-vFolders">Virtual
       Folder</link>, an advanced organizational feature not found in
-      many other mail clients.  If you get a lot of mail, or if you keep
+      mainstream mail clients.  If you get a lot of mail, or if you keep
       every message you get in case you need to refer to it later,
       you'll find this feature especially useful.
     </para>
@@ -98,7 +98,7 @@
     </para>
     
     <para>
-      The <guilabel>Email List</guilabel> lists off all the emails that you
+      The <guilabel>Email List</guilabel> displays all the emails that you
       have.  This includes all your read, unread, and email that is flagged 
       to be deleted.
     </para>
@@ -665,7 +665,7 @@ with quoted materials and the relevant replies interspersed-->
           use the <guibutton>Reply to List</guibutton> instead of the standard
           <guibutton>Reply</guibutton> or <guibutton>Reply to All</guibutton>.
           <note>
-            <title>Whats a Mailing List?</title>
+            <title>What is a Mailing List?</title>
             <para>
               Mailing Lists are one of the most popular ways in which group
               collaboration on the Internet works.  They allow people to send one
@@ -1015,8 +1015,7 @@ with quoted materials and the relevant replies interspersed-->
       <sect2 id="usage-mail-getnsend-ettiquette">
         <title>Seven Tips for Email Courtesy</title>
         <para>
-          I started with ten, but four were "Don't send
-          <glossterm linkend="spam">spam</glossterm>."
+
           <itemizedlist>
 
             <listitem>
@@ -1064,6 +1063,12 @@ with quoted materials and the relevant replies interspersed-->
 	      much, not too little.
 	    </para>
 	  </listitem>
+
+	  <listitem>
+	    <para>
+	      Don't send <glossterm linkend="spam">spam</glossterm>.
+	    </para>
+	  </listitem>
 	</itemizedlist>
       </para>
       <para> Happy mailing! </para>
diff --git a/help/ChangeLog b/help/ChangeLog
index 08d3496759..764f5b5d96 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,5 +1,15 @@
 2001-07-09  Kevin Breit  <battery841@mediaone.net>
 
+	* C/usage-exec-summary.sgml: Editing
+
+	* C/usage-mail.sgml: Editing
+
+	* C/usage-mail-org.sgml: Editing
+
+	* C/usage-calendar.sgml: Editing
+
+	* C/usage-contact.sgml: Editing
+
 	* C/usage-mail-org.sgml: Mention UNMATCHED
 
 	* C/usage-mail.sgml: Commented on trash being a vFolder