Improved structure and added misc section

1 files changed, 123 insertions, 71 deletions

diff --git a/en-US/evolution-new-account.xml b/en-US/evolution-new-account.xml
index 2a2fbb5..47539ce 100644
--- a/en-US/evolution-new-account.xml
+++ b/en-US/evolution-new-account.xml
@@ -10,121 +10,173 @@
 <!-- 
      name: Tushar Kumar
      fas_id: tushark
-     email: tusha.worldwide@gmail.com
+     email: tushark@fedoraproject.org
 -->
-<section id="evolution_email_client" lang="en_US">
+<section id="evolution-main" lang="en_US">
     <title>Evolution Email Client</title>
     <para>
-        <application>Evolution</application> email client is an open source email client. It is one of the best email clients available out there that offers nearly all capabilities that an email client should provide. This article will serve as a guidebook through the process of adding an email account in Evolution.
+        <application>Evolution</application> email client is an open source email client. It is one of the best email clients available out there that offers nearly all capabilities that an email client should provide. This article will serve as an introduction to the process of adding an email account in Evolution and sending or receiving email.
     </para>
-    <section id="prerequisites">
+    <section id="evolution-prerequisites">
         <title>Prerequisites</title>
         <para>
             The following things are required:
         </para>
-            <step>
-                <para>
-                    Fedora Linux installed.
-                </para>
-            </step>
-            <step>
-                <para>
-                    Evolution package installed. Skip to next section to know how to install Evolution in Fedora.
-                </para>
-            </step>
-            <step>
-                <para>
-                    An email account with any email service provider.
-                </para>
-            </step>
-    </section>
-    <section id="installation">
-        <title>Installation</title>
         <step>
             <para>
-                On Gnome, press <keycombo><keycap>Alt</keycap><keycap>f2</keycap></keycombo> and type <application>gnome-terminal</application>.
+                Fedora Linux.
             </para>
         </step>
         <step>
             <para>
-                On KDE, press <keycombo><keycap>Alt</keycap><keycap>f2</keycap></keycombo> and type <application>konsole</application>.
+                Evolution package installed. See <ulink><xref="evolution-installation">Installation</ulink> section for installing Evolution.
             </para>
         </step>
-        <para>
-            Evolution can be installed with following command:
-        </para>
-        <para>
-            <screen>
-                <command>sudo yum -y install evolution</command>
-            </screen>
-        </para>
-    </section>
-    <section id="starting">
-        <title>Starting</title>
+        <step>
             <para>
-                To start using Evolution, press <keycombo><keycap>Alt</keycap><keycap>f2</keycap></keycombo> and type <application>evolution</application>.
+                An email account with any email service provider.
             </para>
+        </step>
     </section>
-    <section id="configuration">
-        <title>Configuration</title>
-            <para>
-                Adding your email account can be done in the following few steps:
-            </para>
-            <procedure>
+    <section id="evolution-installation">
+        <procedure>
+            <title>Installation</title>
                 <step>
                     <para>
-                        Click <guibutton>continue</guibutton> on the welcome screen.
+                        On Gnome, press <keycombo><keycap>Alt</keycap><keycap>f2</keycap></keycombo> and type <application>gnome-terminal</application>. Then press <keycap>Enter</keycap>.
                     </para>
                 </step>
                 <step>
                     <para>
-                        If there is any backup file then select it but if there is no backup file, then just click <guibutton>continue</guibutton>.
+                        On KDE, press <keycombo><keycap>Alt</keycap><keycap>f2</keycap></keycombo> and type <application>konsole</application>. Then press <keycap>Enter</keycap>.
                     </para>
                 </step>
-                <step>
-                    <para>
-                        Enter <userinput>Full Name</userinput> and <userinput>Email Address</userinput> and enter the optional information such as <userinput>Reply-to</userinput> and <userinput>Organisation</userinput> name.Click <guibutton>continue</guibutton>.
-                    </para>
-                </step>
-                <step>
-                    <para>
-                        Click <guibutton>continue</guibutton>.
-                    </para>
-                </step>
-                <step>
-                    <para>
-                        <application>Evolution</application> will look for the server details to be used with email service provider. Please consult email service provider for these details.
-                    </para>
-                </step>
-            </procedure>
                 <para>
-                    In the main window of evolution, click on <guimenu>Edit</guimenu> then select <guimenuitem>Preferences</guimenuitem> and then click on <guibutton>Add</guibutton> for adding a new email account.
+                    Evolution can be installed with following command:
+                </para>
+                <para>
+                    <screen>
+                        <command>sudo yum -y install evolution</command>
+                    </screen>
                 </para>
+        </procedure>
     </section>
-    <section id="usage">
-        <title>Usage</title>
+    <section id="evolution-starting">
+        <title>Starting</title>
+            <para>
+                To start using Evolution, press <keycombo><keycap>Alt</keycap><keycap>f2</keycap></keycombo> and type <application>evolution</application>.
             </para>
-                <section id="usage-sending-email">
+    </section>
+    <section id="evolution-configuration">
+        <title>Configuration</title>
+            <section id="evolution-configuration-add-email">
+                <procedure>
+                    <title>Adding email account in Evolution</title>
+                        <step>
+                            <para>
+                                Click <guibutton>continue</guibutton> on the welcome screen.
+                            </para>
+                        </step>
+                        <step>
+                            <para>
+                                If there is any backup file then select it but if there is no backup file, then just click <guibutton>continue</guibutton>.
+                            </para>
+                        </step>
+                        <step>
+                            <para>
+                                Enter <userinput>Full Name</userinput> and <userinput>Email Address</userinput>. Enter the optional information such as <userinput>Reply-to</userinput> and <userinput>Organisation</userinput> name. Click <guibutton>continue</guibutton>.
+                            </para>
+                        </step>
+                        <step>
+                            <para>
+                                <application>Evolution</application> will look for sending server and receiving server details or these details can be entered manually if evolution didn't find them automatically.
+                            </para>
+                        </step>
+                </procedure>
+            </section>
+            <section id="evolution-configuration-remove-email">
+                <procedure>
+                    <title>Removing email account in Evolution</title>
+                        <para>
+                            In main window of Evolution, click on <guimenu>Edit</guimenu> then select <guimenuitem>Preferences</guimenuitem>. Select the newly added email account then click on <guibutton>Delete</guibutton>.
+                        </para>
+                </procedure>
+            </section>
+    </section>
+    <section id="evolution-usage">
+        <title>Usage</title>
+            <section id="evolution-usage-sending-email">
+                <procedure>
                     <title>Sending Email</title>
                         <para>
-                            Click on <guibutton>New</guibutton> button on upper left. By default it will open a new window for sending a new email or click on the <guimenu>Down Arrow</guimenu> next to <guibutton>New</guibutton> and select <guimenuitem>Mail Message</guimenuitem> to open a new email window.
+                            Click on <guibutton>New</guibutton> button on upper left. Clicking on <guibutton>New</guibutton> will open a new window for editing and sending a new email or click on the <guimenu>Down Arrow</guimenu> next to <guibutton>New</guibutton> button and select <guimenuitem>Mail Message</guimenuitem> to open a new email window.
                         </para>
-                </section>
-                <section id="usage-reveiving-email">
+                </procedure>
+            </section>
+            <section id="evolution-usage-reveiving-email">
+                <procedure>
                     <title>Receiving Email</title>
                         <para>
-                            There are two things associated with receiving an email an evolution:
+                            Evolution checks for new emails after every few minutes. Checking new emails on demand can be done by simply clicking <guibutton>Send / Reveive</guibutton> button next to <guibutton>New</guibutton> button.
                         </para>
+                </procedure>
+            </section>
+    </section>
+    <section id="evolution-misc">
+        <title>Miscellaneous Topics</title>
+            <para>
+                There are many things that can be done in Evolution and in this section, few other features of Evolution are mentioned.
+            </para>
+            <section id="evolution-misc-email-checking-frequency">
+                <procedure>
+                    <title>Email Checking Frequency</title>
+                        <para>
+                            To adjust the time after which Evolution checks for new emails, follow these steps:
+                        </para>
+                        <step>
+                            <para>
+                                click on <guimenu>Edit</guimenu> then select <guimenuitem>Preferences</guimenuitem>.
+                            </para>
+                        </step>
+                        <step>
+                            <para>
+                                Select <guilabel>Account Name</guilabel> and click on <guibutton>Edit</guibutton>.
+                            </para>
+                        </step>
+                        <step>
+                            <para>
+                                Under <guilabel>Identity</guilabel>, click on <guilabel>Receiving Options</guilabel> and under <guilabel>Check for New Mail</guilabel> tick <userinput>Check for new message every minutes</userinput>.
+                            </para>
+                        </step>
+                        <step>
+                            <para>
+                                Enter the desired number of minutes and click <guibutton>Ok</guibutton>.
+                            </para>
+                        </step>
+                </procedure>
+            </section>
+            <section id="evolution-misc-openpgp">
+                <procedure>
+                    <title>Adding OpenPGP Key ID</title>
+                        <para>
+                            OpenPGP Key ID is required for signing and encrypting the emails. To add OpenPGP Key ID, follow these steps:
+                        </para>
+                        <step>
+                            <para>
+                                click on <guimenu>Edit</guimenu> then select <guimenuitem>Preferences</guimenuitem>.
+                            </para>
+                        </step>
                         <step>
                             <para>
-                                Evolution checks for new emails after every few minutes, therefore, for checking it on demand by simply clicking <guibutton>Send / Reveive</guibutton> button next to <guibutton>New</guibutton> button.
+                                Select <guilabel>Account Name</guilabel> and click on <guibutton>Edit</guibutton>.
                             </para>
                         </step>
                         <step>
                             <para>
-                                To adjust the time after which Evolution checks for new emails, click on <guimenu>Edit</guimenu> then select <guimenuitem>Preferences</guimenuitem>. Then select <guilabel>Account Name</guilabel> and click on <guibutton>Edit</guibutton>. Click on <guilabel>Receiving Options</guilabel> and under <guilabel>Check for New Mail</guilabel> tick <userinput>Check for new message every minutes</userinput>. Enter the desired number of minutes.
+                                Under <guilabel>Security</guilabel>, enter <userinput>Key ID</userinput> next to OpenPGP Key ID and click <guibutton>Ok</guibutton>.
                             </para>
                         </step>
-                </section>
+                </procedure>
+            </section>
     </section>
 </section>