[evolution/help-reorder] Complete the IMAP configuration and security options.

[Julita Inca <jinca src gnome org>]

commit 76bb0332b97c8639150c69dfa63271829d9d4dfe
Author: Julita Inca <jinca gnome org>
Date:   Mon May 19 04:38:54 2014 +0100

    Complete the IMAP configuration and security options.

 help/C/assistant.page        |    2 +-
 help/C/imap-receiving.page   |   42 ++++++++++++++++++++++++++++++++----------
 help/C/receiving-option.page |   24 ++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 11 deletions(-)
---
diff --git a/help/C/assistant.page b/help/C/assistant.page
index a87b6b1..054de21 100644
--- a/help/C/assistant.page
+++ b/help/C/assistant.page
@@ -58,7 +58,7 @@
          <p>You can use this option if you use an email service like Gmail, Hotmail, Yahoo or another one. 
              See how to <link xref="imap-receiving">configure it.</link></p>
           <note>
-              <p>If you have ordered your messages in files in your mail inbox, IMAP will keep the structure 
+              <p>If you have ordered your messages in folders in your mail inbox, IMAP will keep the 
structure 
                  and will show your messages in the same order as you put them.</p>
               <p>IMAP will also make an offline copy in your device, so you can access to your messages 
online from other multiple devices.</p>
           </note>  
diff --git a/help/C/imap-receiving.page b/help/C/imap-receiving.page
index 07b5c36..81a6dd5 100644
--- a/help/C/imap-receiving.page
+++ b/help/C/imap-receiving.page
@@ -14,13 +14,17 @@
 
     <desc>Know more about the receiveing mail options of Evolution.</desc>
   </info>
+  
   <title>IMAP+</title>
    <list>
       <title>Configuration</title>
         <item>
           <p>Server</p>   
-          <p>Type the name server of the email service you use. E.g.:<gui>imap.gmail.com</gui> with the port 
number <gui>993</gui>, if you use Gmail;
-             or you can type <gui>imap.mail.yahoo.com</gui> and choose the port number <gui>993</gui>, if 
you use Yahoo. </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>
@@ -30,29 +34,47 @@
    </list>
    <list>
       <title>Security</title>
-       <item> 
+       
          <p>Encryption method:</p>
          <p>No encryption</p>
-         <p>STARTTLS after connecting</p>
-         <p>SSL on a dedicated port</p>
-       </item>
+            <p>This probably will not take you a secure connection.</p>    
+         <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>
+             <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>
+             </item>
    </list>
    <list>
       <title>Authentication</title>
        <item>
          <p>Password</p>
-       </item>
-       <item>
-          <p>NTLM/SPA</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>
        </item>
        <item>
           <p>DIGEST-MD5</p>
+          <p>It is a method for encrypting a password that use MD5 algorithm. It is used for advanced 
users.</p>
        </item>
        <item>
-          <p>CRAM-MD5</p>   
+          <p>CRAM-MD5</p>
+          <p>It is a method for encrypting a password that use MD5 algorithm. It is used for advanced 
users.</p>
        </item>
    </list>
+
+  <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>
+  </note> 
+
+
 </page>
diff --git a/help/C/receiving-option.page b/help/C/receiving-option.page
new file mode 100644
index 0000000..0572ca6
--- /dev/null
+++ b/help/C/receiving-option.page
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/";
+      type="topic" style="task"
+      id="receiving-option">
+  <info>
+    <revision version="1.0" date="2014-05-18" status="review"/>
+    <link type="guide" xref="index#assistant"/>
+    <credit type="author copyright">
+      <name>Julita Inca</name>
+      <email>yrazes gmail com</email>
+      <years>2014</years>
+    </credit>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
+    <desc>Know more about the receiveing mail options of Evolution.</desc>
+  </info>
+
+  <title>IMAP+</title>
+
+
+
+
+
+</page>