*** empty log message ***

svn path=/trunk/; revision=22810

3 files changed, 49 insertions, 32 deletions

diff --git a/help/C/config-prefs.xml b/help/C/config-prefs.xml
index 35457b05b9..8b1fd615cd 100644
--- a/help/C/config-prefs.xml
+++ b/help/C/config-prefs.xml
@@ -9,8 +9,8 @@
         will tell you how to do just that.
       </para>
       <para>
-        Evolution 1.2 brings with it a redesigned comprehensive
-        settings window that you can open by choosing <menuchoice>
+        You can reach the Evolution settings window 
+        by choosing <menuchoice>
         <guimenu>Tools</guimenu>
         <guimenuitem>Settings</guimenuitem></menuchoice>, no matter
         where you are in Evolution. On the left half of the settings
diff --git a/help/C/usage-mail-org.xml b/help/C/usage-mail-org.xml
index bb9b3c207c..bea80ce056 100644
--- a/help/C/usage-mail-org.xml
+++ b/help/C/usage-mail-org.xml
@@ -627,10 +627,10 @@
 		  </para></listitem>
 		
 		<listitem><para>
-		    Score - Emails have a standard priority range from -3 (least
-		    important) to 3 (most important). You can have filters set the
-		    priority of messages you receive, and then have other filters 
-		    applied only to those messages which have a certain priority.
+        Score - Set the message score to any whole number greater than
+        0.  To use filters with scoring, use one filter to score a
+        message, and then apply other filters only to messages with
+        the scores you seek.
 		  </para></listitem>
 		
 		<listitem>
diff --git a/help/C/usage-mail.xml b/help/C/usage-mail.xml
index 0facfd8fd7..107bc6895e 100644
--- a/help/C/usage-mail.xml
+++ b/help/C/usage-mail.xml
@@ -286,10 +286,14 @@
           <tip>
             <title>Sharing Mailboxes with Other Mail Programs</title>
             <para>
-              If you want to use <application>Evolution</application>
-              and another email client, such as
-              <application>Mutt</application>, at the same time,
-              here's how:
+              You can use <application>Evolution</application>
+              alongside another email client, such as
+              <application>Mutt</application>, or use transport agents
+              like <application>fetchmail</application> instead of the
+              mail transport mechanism included in
+              <application>Evolution.</application>.
+              To do so, you will set Evolution to read messages from
+              the other application's directories:
               <orderedlist numeration="arabic">
                 <listitem>
                    <para>
@@ -299,32 +303,45 @@
                   </listitem>
                 <listitem>
                    <para>
-                      In <application>Evolution</application>, select
-                      <menuchoice><guimenu>Tools</guimenu><guimenuitem>
-                      Settings</guimenuitem></menuchoice>, go to the
-                      Mail Accounts configuration tool, and pick the account
-                      you'd like to use to share mail. You may want to
-                      create a new account just for this source of
-                      mail.
+                      In <application>Evolution</application>, select 
+                     <menuchoice><guimenu>Tools</guimenu><guimenuitem>
+                      Settings</guimenuitem></menuchoice> and select the 
+                      Mail Accounts configuration tool. 
                    </para>
-               </listitem>                     
+                 </listitem>
+                 <listitem>
+                   <para>
+                     Select an existing account and click
+                     <guibutton>Edit</guibutton>, or click
+                     <guibutton>New</guibutton> to create a new account.
+                   </para>
+               </listitem>                                 
                <listitem>
                    <para>
-                      Under the <guilabel>Receiving Mail</guilabel>
-                      tab, select the type of mail file that your
-                      other mail application uses, and then enter the
-                      full path to that location. A typical choice
-                   would be mbox files, with the path /home/username/Mail/.
-                 </para>
-                  </listitem>
-                <listitem>
+                     If editing an existing account, click the
+                     <guilabel>Receiving Mail</guilabel> tab. If you
+                     have created a new account, fill out the
+                     requested information until you reach the
+                     <guilabel>Receiving Mail</guilabel> step.
+                   </para>
+                 </listitem>
+                 <listitem>
                    <para>
-                      Click the <guibutton>OK</guibutton> button.
+                      For your mail source, select the type of mail
+                     file that your other mail application uses, and
+                     then enter the full path to that location. A
+                     typical choice would be mbox files, with the path
+                     /home/username/Mail/.
                    </para>
-                  </listitem>
-                </orderedlist>
-               </para>
-            </tip>
+                 </listitem>
+                 <listitem>
+                   <para>
+                     Click the <guibutton>OK</guibutton> button.
+                   </para>
+                 </listitem>
+               </orderedlist>
+             </para>
+           </tip>
 
 
 <!-- NOT FOR 1.0
@@ -1796,7 +1813,7 @@ wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
       </para>
       <para>
         If someone sends you their public key directly, save it as a
-        plain text file and enter the command <command>gpg
+        plain text file and enter the command <command>gpg --import
         filename</command>. This will add it to your keyring.
       </para>
     </sect2>