fixing typos, etc

svn path=/trunk/; revision=22859

1 files changed, 53 insertions, 68 deletions

diff --git a/help/C/usage-mail.xml b/help/C/usage-mail.xml
index 107bc6895e..65a7a30715 100644
--- a/help/C/usage-mail.xml
+++ b/help/C/usage-mail.xml
@@ -286,14 +286,10 @@
           <tip>
             <title>Sharing Mailboxes with Other Mail Programs</title>
             <para>
-              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:
+              If you want to use <application>Evolution</application>
+              and another email client, such as
+              <application>Mutt</application>, at the same time,
+              here's how:
               <orderedlist numeration="arabic">
                 <listitem>
                    <para>
@@ -303,45 +299,32 @@
                   </listitem>
                 <listitem>
                    <para>
-                      In <application>Evolution</application>, select 
-                     <menuchoice><guimenu>Tools</guimenu><guimenuitem>
-                      Settings</guimenuitem></menuchoice> and select the 
-                      Mail Accounts configuration tool. 
+                      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.
                    </para>
-                 </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>                     
                <listitem>
                    <para>
-                     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>
-                      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>
-                 <listitem>
+                      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>
                    <para>
-                     Click the <guibutton>OK</guibutton> button.
+                      Click the <guibutton>OK</guibutton> button.
                    </para>
-                 </listitem>
-               </orderedlist>
-             </para>
-           </tip>
+                  </listitem>
+                </orderedlist>
+               </para>
+            </tip>
 
 
 <!-- NOT FOR 1.0
@@ -586,9 +569,9 @@
 
       <para>
         To mark a folder for offline use, select <menuchoice>
-        <guimenu>Settings</guimenu>
-        <guimenuitem>Preferences</guimenuitem> </menuchoice> and then
-        click the <guilabel>Folders</guilabel> icon. In the
+        <guimenu>Tools</guimenu>
+        <guimenuitem>Settings</guimenuitem> </menuchoice> and then
+        click the <guilabel>Folder Settings</guilabel> icon. In the
         <guilabel>Offline Folders</guilabel> tab, click the check-box
         next to the folders that you would like to use while you are
         offline. 
@@ -649,10 +632,10 @@
         </para>
         <para>
             To hide the display of files you've attached to the
-            message, select <menuchoice>
-            <guimenu>View</guimenu> <guimenuitem>Hide
+            message, unselect <menuchoice>
+            <guimenu>View</guimenu> <guimenuitem>Show
             Attachments</guimenuitem> </menuchoice>; to show them
-            again, choose <guimenuitem>Show Attachments</guimenuitem>.
+            again, select <guimenuitem>Show Attachments</guimenuitem>.
         </para>
         <para>
             When you send the message, a copy of the attached file
@@ -758,8 +741,8 @@
           <para>
             Alternately, you can click on the
             <guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or
-            <guibutton>Bcc:</guibutton> buttons to get a list --
-            potentially a very long one -- of the email addresses
+            <guibutton>Bcc:</guibutton> buttons to get a list &mdash;
+            potentially a very long one &mdash; of the email addresses
             in your contact manager.  Select addresses and click on
             the arrows to move them into the appropriate address
             columns.
@@ -1004,10 +987,10 @@
 		selected, the style will apply to whatever you type
 		next.  The buttons are:
 		<itemizedlist mark="none">
-		  <listitem><para>Push <guibutton>B</guibutton> for bold text</para></listitem>
-		  <listitem><para>Push <guibutton>I</guibutton> for italics</para></listitem>
-		  <listitem><para>Push <guibutton>U</guibutton> to underline</para></listitem>
-		  <listitem><para>Push <guibutton>S</guibutton> for a strikethrough.</para></listitem>
+		  <listitem><para>Push <guiicon>bold A</guiicon> for bold text</para></listitem>
+		  <listitem><para>Push <guiicon>italic A</guiicon> for italics</para></listitem>
+		  <listitem><para>Push <guiicon>underlined A</guiicon> to underline</para></listitem>
+		  <listitem><para>Push <guiicon>striked A</guiicon> for a strikethrough.</para></listitem>
 		</itemizedlist>
 	      </para>
 	    </listitem>
@@ -1049,7 +1032,9 @@
                   selected, the color will apply to whatever you type
                   next.  You can select a background color or image by
                   right-clicking on the message background and
-                  selecting <guilabel>Page</guilabel>.
+                  selecting <menuchoice> <guimenuitem>Style</guimenuitem> 
+                  <guimenuitem>Page Style</guimenuitem>
+                   </menuchoice>.
                </para>
             </listitem>
           </varlistentry>
@@ -1284,7 +1269,7 @@
 		  Insert
 		  </guimenu>
 		  <guimenuitem>
-		    HTML Template
+		    Template
 		  </guimenuitem>
 		</menuchoice>
 	      </para>
@@ -1359,7 +1344,7 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
           you prefer to forward the message <glossterm
           linkend="inline">inline</glossterm>
           instead of attached, select <menuchoice>
-          <guimenu>Actions</guimenu> <guimenuitem>Forward
+          <guimenu>Actions</guimenu><guisubmenu>Forward</guisubmenu><guimenuitem>
           Inline</guimenuitem> </menuchoice> from the menu.  Choose an
           addressee as you would when sending a new message; the
           subject will already be entered, although you can alter it
@@ -1444,7 +1429,7 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
     </para>
     <para>
       If you click on the attachment button and click the
-      <guibutton>View Inline</guibutton>, <application>Ximian
+      <guimenuitem>View Inline</guimenuitem>, <application>Ximian
       Evolution</application> will show you information about the
       meeting, and let you respond to the meeting in several ways.
       Select the response that you would like, and then click the
@@ -1737,10 +1722,10 @@ action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
         by typing <command>gpg --list-keys</command>.  You should see
         something similar to this:
         <programlisting>
-	    /home/you/.gnupg/pubring.gpg
-	    ----------------------------
-	    pub 1024D/32j38dk2 2001-06-20 you &lt;you@your-address.com&gt;
-	    sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]
+        /home/you/.gnupg/pubring.gpg
+        ----------------------------
+        pub 1024D/32j38dk2 2001-06-20 you &lt;you@your-address.com&gt;
+        sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]
 	</programlisting>
       </para>
       <para>
@@ -1775,11 +1760,11 @@ wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
 	  <para>
 	    Key servers store your public keys for you so that your
 	    friends can decrypt your messages.  If you choose not to
-	    use a key server, you must distribute your public key in
-	    other ways. For example, you can attach it to emails or
-	    put it on your own web page. However, it's easier to
-	    publish them once, and then let people download them from
-	    a central place when they want.
+	    use a key server, you can manually send your people public
+	    key, include it in your signature file, or put it on your
+	    own web page. However, it's easier to publish them once,
+	    and then let people download them from a central place when
+	    they want.
 	  </para>
           <para>
              If you don't have a key you need to unlock or encrypt a
@@ -1813,7 +1798,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 --import
+        plain text file and enter the command <command>gpg
         filename</command>. This will add it to your keyring.
       </para>
     </sect2>