[evolution/help-reorder] Edit the IMAP protocol and assistant pages, spelling and format.

[Julita Inca <jinca src gnome org>]

commit a909e5f934f4c926de9da54d72f4b78c752b1aac
Author: Julita Inca <jinca gnome org>
Date:   Thu Jul 31 12:02:55 2014 +0100

    Edit the IMAP protocol and assistant pages, spelling and format.

 help/C/assistant.page      |   21 ++++++++++-----------
 help/C/imap-receiving.page |   37 ++++++++++++++++++++++---------------
 2 files changed, 32 insertions(+), 26 deletions(-)
---
diff --git a/help/C/assistant.page b/help/C/assistant.page
index 14f39ba..f7dd9a4 100644
--- a/help/C/assistant.page
+++ b/help/C/assistant.page
@@ -28,16 +28,16 @@
 
   <section id="restore-backup">
   <title>Restore from a backup file</title>
-       <p>Select your <gui>backup</gui>, in case you have a file to restore mailbox from previous version, 
then click on <gui>Continue</gui>.
-           If you do not have a backup, click on <gui>Continue</gui>.</p>
+       <p>Check <gui>Restore from a backup file</gui>, in case you have a file to restore mailbox from 
previous version, 
+           then click on <gui>Continue</gui>. If you do not have a backup, click on <gui>Continue</gui>.</p>
   </section>
 
 <section id="identity">
   <title>Identity</title>
        <p>Enter your name and email address to identify yourself, then click on <gui>Continue</gui>.</p>
         <note>
-           <p>Optionally, register another email account on <gui>Reply-To</gui> if you want to copy all the 
messages you send.</p> 
-           <p>The name of the organization you belong is also optional. It will appear when somebody import 
you as his/her contact.</p>    
+           <p>Optionally, register another email account on <gui>Reply-To</gui> if you want to send a copy 
of all the messages you send.</p> 
+           <p>Also you can enter the name of your organization. This lets you to group easily in the contact 
list.</p>    
         </note>  
 </section>
     
@@ -79,7 +79,7 @@
    <table frame="all">
      <tr>
       <td>  
-          <p>Please see the rest of the options for receiving email <link 
xref="assistant-more">here</link>.</p>
+          <p>See other options for receiving email, <link xref="assistant-more">here</link>.</p>
       </td>
      </tr> 
    </table>
@@ -108,15 +108,14 @@
 <section id="account-summary">
   <title>Account Summary</title>
         <p>Enter your name and email to identify yourself, then click on <gui>Continue</gui>.</p>
-     <p>Optinally, you can hiddenly copy all the messages you send to another account. You can also register 
the name of the organization you belong. It will appear the moment somebody import you as his/her contact.</p>
+     <p>Optionally, you can send a copy of all your messages secretly to your another account.</p> 
+     <p>You can also register the name of the organization you belong. 
+        It will appear the moment somebody import you as his/her contact.</p>
   </section>
 
 <section id="done">
   <title>Done</title>
-        <p>Enter your name and email to identify yourself, then click on <gui>Continue</gui>.</p>
-     <p>Optinally, you can hiddenly copy all the messages you send to another account. You can also register 
the name of the organization you belong. It will appear the moment somebody import you as his/her contact.</p>
-  </section>
-
-
+        <p>You get a message for completing the configuration successfully.</p>
+</section>
 
 </page>
diff --git a/help/C/imap-receiving.page b/help/C/imap-receiving.page
index 81a6dd5..ac357cc 100644
--- a/help/C/imap-receiving.page
+++ b/help/C/imap-receiving.page
@@ -12,7 +12,7 @@
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
-    <desc>Know more about the receiveing mail options of Evolution.</desc>
+    <desc>Know more about the receiving mail options of Evolution.</desc>
   </info>
   
   <title>IMAP+</title>
@@ -22,11 +22,11 @@
           <p>Server</p>   
           <p>Type the name server of the email service you use. E.g.:<gui>imap.gmail.com</gui>, if you use 
Gmail;
              or you can type <gui>imap.mail.yahoo.com</gui>, in case you use Yahoo. </p> 
-          <note>
-             <p>You can either user the port 143 or 993 depeding on the <gui>security</gui> option you use 
for encryption.</p>
-          </note>
         </item>
-
+        <item>
+          <p>Port</p>
+             <p>You can either use the port 143 or 993 depending on the <gui>security</gui> option you use 
for encryption.</p>
+        </item>
         <item>
           <p>Username</p>
           <p>Enter your email account. E.g.:username gmail com or username2 yahoo com </p>
@@ -41,25 +41,30 @@
          <p>There are two ways to establish an encrypted network connection to provide communication 
security over Internet:</p>
              <item>
                  <p>STARTTLS after connecting</p>
-                 <p>Accept connections on a port which is initially encrypted. The STARTTLS negotiation 
takes place a part of the initial connection 
-                    before an interactive session is established. No explicit command is required to secure 
the connection, use the port 993 for this.</p>                 </item>
+                 <p>Accept connections on a port which is initially encrypted. The STARTTLS negotiation 
takes place a part 
+                    of the initial connection before an interactive session is established. 
+                    No explicit command is required to secure the connection, use the port 993 for this.
+                 </p>                 
+             </item>
              <item>
                  <p>SSL on a dedicated port</p>
-                 <p>Connect to the IMAP server's standard port (port 143) to establish an interactive 
session with the server, then issue a STARTTLS command.
-                    This performs a negotiation with the IMAP server that, in effect, wrappers the unsecured 
connection with an encryption layer. 
-                    Once the connection is encrypted, it is safe to authenticate the user with a mechanism 
as simple as a plain-text password. </p>
+                 <p>Connect to the IMAP server's standard port (port 143) to establish an interactive 
session with the server,
+                    then issue a STARTTLS command. This performs a negotiation with the IMAP server that, in 
effect, wrappers
+                    the unsecured connection with an encryption layer. Once the connection is encrypted, it 
is safe to
+                    authenticate the user with a mechanism as simple as a plain-text password. </p>
              </item>
    </list>
    <list>
       <title>Authentication</title>
        <item>
          <p>Password</p>
-         <p> If the network connection is already secured at the transport layer, then simple plain-text 
password authentication 
-             should be sufficient for most users.</p>
+         <p> If the network connection is already secured at the transport layer, then simple plain-text 
password 
+             authentication should be sufficient for most users.</p>
        </item>
        <item>
           <p>GSSAPI</p>
-          <p>As corporate worker may have already obteined a valid Kerberos token to access internal company 
resources as email.</p>
+          <p>As corporate worker may have already obtained a valid Kerberos token to access internal company 
resources 
+             as email.</p>
        </item>
        <item>
           <p>DIGEST-MD5</p>
@@ -71,9 +76,11 @@
        </item>
    </list>
 
+<p>Click on <gui>Continue</gui> to configure <link xref="receiving-option">Receiving Options</link>.</p>
+
   <note style="important">
-   <p>When you finished to configure the <gui>Receiving Email</gui> part, you can <gui>Go Back</gui> to 
choose another protocol to receive email or you can 
-      <gui>Continue</gui>. If you selected <gui>Continue</gui> you will be able to configure <link 
xref="receiving-option">Receiving Options</link>.</p>
+      <p>You can change the protocol during the configuration in the <gui>Receiving Email</gui> part, 
+      by clicking <gui>Go Back</gui>.</p>
   </note>