Fixed comments 61 to 80 of bug #438479.

2008-07-20  Andre Klapper  <a9016009@gmx.de>

	* C/evolution.xml: Fixed comments 61 to 80 of bug #438479.


svn path=/trunk/; revision=35767

2 files changed, 51 insertions, 62 deletions

diff --git a/help/C/evolution.xml b/help/C/evolution.xml
index a66fd7b42a..ba04ed5ad4 100644
--- a/help/C/evolution.xml
+++ b/help/C/evolution.xml
@@ -323,7 +323,7 @@
       <orderedlist>
        <listitem id="bstg8f2">
         <para>Type the server name of your e-mail server in the Server field.</para>
-        <para>If you don't know the Server, contact your administrator.</para>
+        <para>If you are unsure what your Server address is, contact your system administrator.</para>
        </listitem>
        <listitem id="bstg8sr">
         <para>Type your username for the account in the Username field.</para>
@@ -678,7 +678,7 @@
       <mediaobject id="bsj8ujq"><imageobject><imagedata format="PNG" fileref="figures/evo_send_setup_a.png"/></imageobject></mediaobject>
       <orderedlist>
        <listitem id="bsthxta">
-        <para>Type the Server address in the Server field.</para>
+        <para>Type the server name of your e-mail server in the Server field.</para>
         <para>If you are unsure what your Server address is, contact your system administrator.</para>
        </listitem>
        <listitem id="bsthy6f">
@@ -1133,8 +1133,8 @@
    <title>Reading Mail</title>
    <para>If you are not already viewing mail, switch to the mail tool by clicking the Mail shortcut button, or press Ctrl+1. To read a message, select it in the message list; if you'd like to see it in its own window, either double-click it, press Enter, or press Ctrl+O.</para>
    <tip>
-    <para>To read mail with the keyboard, you can click the Spacebar to page down and press Backspace to page up while reading an e-mail. Ensure that you use the keys when message list is enabled.</para>
-    <para>Navigate the message list by using the arrow keys on the keyboard. To go to the next and previous unread messages, press the period (.) or comma (,) keys. On most keyboards, these keys are also marked with the &gt; and &lt; symbols, which is a convenient way to remember that they move you forward and backward in your message list. You can also use the right square bracket (]) for the next unread message, and the left square bracket ([) for the previous unread message.</para>
+    <para>To read mail with the keyboard, you can click the Spacebar to page down and press Backspace to page up while reading an e-mail. Ensure that you use the keys when the message list is enabled.</para>
+    <para>Navigate the message list by using the arrow keys on the keyboard. To go to the next and previous unread messages, press the period (.) or comma (,) keys. On some keyboards, these keys are also marked with the &gt; and &lt; symbols, which is a convenient way to remember that they move you forward and backward in your message list. You can also use the right square bracket (]) for the next unread message, and the left square bracket ([) for the previous unread message.</para>
    </tip>
 
    <section id="b17rgdac">
@@ -1143,7 +1143,10 @@
     <para>To enable Magic Spacebar:</para>
     <orderedlist>
      <listitem id="b1axmc7p">
-      <para>Click Edit &gt; Preferences &gt; Mail Preferences and select the Enable Magic Spacebar check box.</para>
+      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
+     </listitem>
+     <listitem id="b1axmc7q">
+      <para>Select the Enable Magic Spacebar check box.</para>
      </listitem>
     </orderedlist>
     <para>When you are in the Mail view, the Spacebar has the following behavior:</para>
@@ -1192,7 +1195,7 @@
       <para>Click View &gt; Preview &gt; Vertical View</para>
      </listitem>
     </orderedlist>
-    <para>In Vertical view, default message list contains a double line compressed headers, which enables you to consume the extra width in the preview column.The compressed columns have Sender Name and Email, Attachment Icon, Date and Subject in the second line.</para>
+    <para>In Vertical view, default message list contains a double line compressed headers, which enables you to consume the extra width in the preview column. The compressed columns have Sender Name and Email, Attachment Icon, Date and Subject in the second line.</para>
     <mediaobject id="b159qju3"><imageobject><imagedata format="PNG" fileref="figures/ver_view_a.png"/></imageobject></mediaobject>
     <formalpara id="b131nkqr">
      <title>Classical View:</title>
@@ -1212,13 +1215,13 @@
     <para>Use the following procedure to set the limit of addresses to be displayed:</para>
     <orderedlist>
      <listitem id="b131onkl">
-      <para>Click Edit &gt; Preferences</para>
+      <para>Select Edit &gt; Preferences.</para>
      </listitem>
      <listitem id="b131onsx">
-      <para>Select Mail Preferences</para>
+      <para>Select Mail Preferences.</para>
      </listitem>
      <listitem id="b131onvr">
-      <para>Check <guilabel>Shrink To/CC/Bcc headers to column</guilabel> to limit the address</para>
+      <para>Check <guilabel>Shrink To/CC/Bcc headers to column</guilabel> to limit the address.</para>
      </listitem>
      <listitem id="b131oo0c">
       <para>Enter the limit in the field.</para>
@@ -1235,7 +1238,9 @@
       <para>Download your mail in the other application as you would normally.</para>
      </listitem>
      <listitem id="bsen3u8">
-      <para>In Evolution, click Edit &gt; Preferences, then click Mail Accounts. Select the account you want to use to share mail and click Edit. Instead of Edit, you might want to create a new account just for this source of mail by clicking New.</para>
+      <para>In Evolution:</para>
+      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
+      <para>Select the account you want to use to share mail and click Edit. Instead of Edit, you might want to create a new account just for this source of mail by clicking New.</para>
      </listitem>
      <listitem id="bsen3wh">
       <para>Under the Receiving Mail tab, select the type of mail file that your other mail application uses, then specify the full path to that location. A typical choice would be mbox files, with the path /home/<varname>username</varname>/Mail/.</para>
@@ -1258,7 +1263,10 @@
      <para>To save an attachment to disk:</para>
      <orderedlist>
       <listitem id="bsen45z">
-       <para>Click the down-arrow on the attachment icon, or right-click the attachment icon in the attachment bar, then click Save As.</para>
+       <para>Click the down-arrow on the attachment icon or right-click the attachment icon in the attachment bar.</para> 
+      </listitem>
+      <listitem id="bsen45d">
+       <para>Click Save As.</para>
       </listitem>
       <listitem id="bsen4bg">
        <para>Select a location and name for the file.</para>
@@ -1295,7 +1303,7 @@
      <para>To set the default action for loading images:</para>
      <orderedlist>
       <listitem id="bsenabn">
-       <para>Click Edit &gt; Preferences, then click Mail Preferences.</para>
+       <para>Select Edit &gt; Preferences, then select Mail Preferences.</para>
       </listitem>
       <listitem id="bsenajw">
        <para>Click the HTML Mail tab.</para>
@@ -2115,7 +2123,7 @@
     <title>Setting up GPG Encryption</title>
     <orderedlist>
      <listitem id="bsg364h">
-      <para>Click Edit &gt; Preferences, then click Mail Accounts.</para>
+      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
      </listitem>
      <listitem id="bsg368f">
       <para>Select the account you want to use securely, then click Edit.</para>
@@ -2153,7 +2161,7 @@
     <para>You can set Evolution to always sign your e-mail messages:</para>
     <orderedlist>
      <listitem id="bsaj12e">
-      <para>Click Edit &gt; Preferences, then select Mail Accounts.</para>
+      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
      </listitem>
      <listitem id="bsaj1aj">
       <para>Select the mail account to encrypt, then click Edit.</para>
@@ -2190,7 +2198,10 @@
      <title>Adding a Signing Certificate</title>
      <orderedlist>
       <listitem id="bsg2rkq">
-       <para>Click Edit &gt; Preferences, then click Certificate.</para>
+       <para>Select Edit &gt; Preferences.</para>
+      </listitem>
+      <listitem id="bsg2rkq">
+       <para>Click Certificates.</para>
       </listitem>
       <listitem id="bsg2rra">
        <para>Click Import.</para>
@@ -2211,7 +2222,10 @@
      <para>To have every message signed or encrypted:</para>
      <orderedlist>
       <listitem id="bsg2t55">
-       <para>Click Edit &gt; Preferences, then select the account to encrypt the messages in.</para>
+       <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
+      </listitem>
+      <listitem id="bsg2t56">
+       <para>Select the account to encrypt the messages in.</para>
       </listitem>
       <listitem id="bsg2tam">
        <para>Click Edit, then click Security.</para>
@@ -2765,7 +2779,7 @@
       <para>For each of the filter criteria, you must first select which parts of the message you want to filter:</para>
       <formalpara id="bsh25ic">
        <title>Sender:</title>
-       <para>The sender's address.</para>
+       <para>The sender's email address or the name of the sender.</para>
       </formalpara>
       <formalpara id="bsh25ui">
        <title>Recipient:</title>
@@ -2786,7 +2800,7 @@
       </formalpara>
       <formalpara id="bshkb9x">
        <title>Expression:</title>
-       <para>(For programmers only) Match a message according to an expression you write in the Scheme language, used to define filters in Evolution.</para>
+       <para>(For programmers only) Match a message according to an expression you write in the Scheme language used to define filters in Evolution.</para>
       </formalpara>
       <formalpara id="bshkbvl">
        <title>Date Sent:</title>
@@ -2798,7 +2812,7 @@
       </formalpara>
       <formalpara id="bshkcwe">
        <title>Label:</title>
-       <para>Messages can have labels of Important, Work, Personal, To Do, or Later. You can set tables with other filters or by hand.</para>
+       <para>Messages can have labels of Important, Work, Personal, To Do, or Later. You can set labels with other filters or manually.</para>
       </formalpara>
       <formalpara id="bshkdbe">
        <title>Score:</title>
@@ -2852,13 +2866,13 @@
        <listitem>
         <formalpara id="bsmr5pj">
          <title>Move to Folder:</title>
-         <para>Moves the message into a folder you specify. Click Here to select the destination folder.</para>
+         <para>Moves the message into a folder you specify.</para>
         </formalpara>
        </listitem>
        <listitem>
         <formalpara id="bsmr9sg">
          <title>Copy to Folder:</title>
-         <para>Puts a copy of the message into a folder you specify. Click Here to select the destination folder.</para>
+         <para>Puts a copy of the message into a folder you specify.</para>
         </formalpara>
        </listitem>
        <listitem>
@@ -2870,7 +2884,7 @@
        <listitem>
         <formalpara id="bsmr9zn">
          <title>Stop Processing:</title>
-         <para>Select this if you want to have all other filters ignore this message.</para>
+         <para>Select this if you want to all other filters ignore this message. Note that only filters listed after this particular rule will be ignored.</para>
         </formalpara>
        </listitem>
        <listitem>
@@ -5003,7 +5017,7 @@
      <title>Creating a New Exchange Account</title>
      <orderedlist>
       <listitem id="bshnbof">
-       <para>Click Edit &gt; Preferences or press Shift+Ctrl+S</para>
+       <para>Select Edit &gt; Preferences.</para>
       </listitem>
       <listitem id="bshnbsi">
        <para>Click Add.</para>
@@ -5028,20 +5042,11 @@
      <para>Use the following procedure to configure your existing account for Evolution Exchange:</para>
      <orderedlist>
       <listitem id="bsqdqje">
-       <para>Click Edit &gt; Preferences or press Shift+Ctrl+S, then click Mail Accounts.</para>
+       <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
       </listitem>
       <listitem id="bsqdqvl">
        <para>Select the account you want to convert, then click Edit to appear the Account Editor.</para>
        <para>You can view Identity tab enabled.</para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
        <mediaobject id="b13p90wc"><imageobject><imagedata format="PNG" fileref="figures/exchg-identity.png"/></imageobject></mediaobject>
        
       </listitem>
@@ -5050,20 +5055,6 @@
       </listitem>
       <listitem id="bshngsm">
        <para>Click the Receiving Mail tab, then select Microsoft Exchange as your server type.</para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
        <mediaobject id="b13pb2z0"><imageobject><imagedata format="PNG" fileref="figures/exchng-rec-mail.png"/></imageobject></mediaobject>
        
       </listitem>
@@ -5071,16 +5062,7 @@
        <para>Type your user name, and the Outlook Web Access (OWA) URL. Click Authenticate, then enter the password at the prompt. The Exchange server authenticates your account.</para>
       </listitem>
       <listitem id="bxpfgk7">
-       <para>Select your authentication method.</para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
-       <para></para>
+       <para>Select your authentication type in the Authentication list.</para>
        <mediaobject id="b13pb4ri"><imageobject><imagedata format="PNG" fileref="figures/exchng-rec-option.png"/></imageobject></mediaobject>
        
       </listitem>
@@ -5227,7 +5209,10 @@
      <para>To add someone to your list of delegates:</para>
      <orderedlist>
       <listitem id="bxpfj0n">
-       <para>Click Edit &gt; Preferences or press Shift+Ctrl+S, then click the Exchange Settings tab.</para>
+       <para>Select Edit &gt; Preferences.</para>
+      </listitem>
+      <listitem id="bxpfj0n">
+       <para>Click the Exchange Settings tab.</para>
       </listitem>
       <listitem id="b17qx94g">
        <para>Click Delegation Assistant to open the Delegates dialog box.</para>
@@ -5328,7 +5313,7 @@
     <para>An Out of Office message is an automatic reply that you can send as a reply to messages, explaining why you are not immediately responding to their messages. For example, if you go on vacation for a week and will not access your e-mail, you can set an automatic reply so that people know that you are not ignoring them.</para>
     <orderedlist>
      <listitem id="bsbgb7t">
-      <para>Click Edit &gt; Preferences &gt; Mail Accounts.</para>
+      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
      </listitem>
      <listitem id="bxn8hun">
       <para>Select the Exchange account, then click Edit.</para>
@@ -5611,7 +5596,7 @@
     <title>Creating a New GroupWise Account</title>
     <orderedlist>
      <listitem id="bv7wb3t">
-      <para>Click Edit &gt; Preferences, then click Mail Accounts.</para>
+      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
      </listitem>
      <listitem id="bv7wbac">
       <para>Click Add.</para>
@@ -5627,7 +5612,7 @@
     <para>If you have an existing e-mail account, and want to convert it to use with GroupWise:</para>
     <orderedlist>
      <listitem id="buw5x0l">
-      <para>Click Edit &gt; Preferences, then click Mail Accounts.</para>
+      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
      </listitem>
      <listitem id="buw5x0m">
       <para>Select the account you want to convert, then click Edit.</para>
@@ -6042,7 +6027,7 @@
     <title>Adding and Removing Proxy Names and Rights in Your Proxy List</title>
     <orderedlist>
      <listitem id="Aai4s3e">
-      <para>Click Edit &gt; Preferences, then click Mail Accounts.</para>
+      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
      </listitem>
      <listitem id="bxmtp5i">
       <para>Select the GroupWise account to edit, then click Edit.</para>
diff --git a/help/ChangeLog b/help/ChangeLog
index 84af176ab1..0e1828f61e 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,5 +1,9 @@
 2008-07-20  Andre Klapper  <a9016009@gmx.de>
 
+	* C/evolution.xml: Fixed comments 61 to 80 of bug #438479.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
 	* C/evolution.xml: Fixed comments 41 to 60 of bug #438479.
 
 2008-07-20  Andre Klapper  <a9016009@gmx.de>