Update the doc for Evolution 2.8. Committing on behalf of Radhika Nair

2006-09-04  Harish Krishnaswamy  <kharish@novell.com>

	* C/evolution.xml: Update the doc for Evolution 2.8.
	Committing on behalf of Radhika Nair <pradhika@novell.com>

svn path=/trunk/; revision=32737

2 files changed, 477 insertions, 106 deletions

diff --git a/help/C/evolution.xml b/help/C/evolution.xml
index 2c918ef139..91e6ddb0b8 100644
--- a/help/C/evolution.xml
+++ b/help/C/evolution.xml
@@ -10,19 +10,19 @@
 ] >
 
 <?yelp:chunk-depth 3?>
-<book id="index" lang="en">
+<book lang="en">
 <title>Evolution User Guide</title>
 
  <bookinfo id="Front">
   <productname>Evolution&trade;</productname>
-  <productnumber>2.6</productnumber>
-  <invpartnumber>March 23, 2006</invpartnumber>
+  <productnumber>2.8</productnumber>
+  <invpartnumber>September 4, 2006</invpartnumber>
   <title>User Guide</title>
  </bookinfo>
 
  <preface id="preface">
   <title>About This Guide</title>
-  <para>This guide describes how to use and manage Evolution&trade; 2.6.<varname>x</varname> client software. This guide is intended for users and is divided into the following sections:</para>
+  <para>This guide describes how to use and manage Evolution&trade; 2.8.<varname>x</varname> client software. This guide is intended for users and is divided into the following sections:</para>
   <itemizedlist>
    <listitem>
     <para><link linkend="usage-mainwindow">Getting Started</link></para>
@@ -84,7 +84,7 @@
    </listitem>
   </itemizedlist>
   <bridgehead id="bt4ckdr">Documentation Updates</bridgehead>
-  <para>For the most recent version of the<citetitle> Evolution 2.6 User Guide</citetitle>, see the <ulink url="http://www.novell.com/documentation/ximian.html">Evolution Documentation Web site</ulink>.</para>
+  <para>For the most recent version of the<citetitle> Evolution 2.8 User Guide</citetitle>, see the <ulink url="http://www.novell.com/documentation/evolution26/index.html">Evolution Documentation Web site</ulink>.</para>
   <bridgehead id="bt4ckds">Documentation Conventions</bridgehead>
   <para>In Novell documentation, a greater-than symbol (&gt;) is used to separate actions within a step and items in a cross-reference path.</para>
   <para>A trademark symbol (&reg;, &trade;, etc.) denotes a Novell trademark. An asterisk (*) denotes a third-party trademark.</para>
@@ -287,7 +287,7 @@
         <para>Click Forward.</para>
        </listitem>
       </orderedlist>
-      <para>(Conditional) If you chose Microsoft Exchange as the server type, provide your username in the Username field and your Outlook Web Access (OWA) URL in the OWA URL field. The URL and the usernames should use the Outlook format. If the mailbox path is different from the username, the OWA path should also include mailbox path, for example http://<varname>server name</varname>/exchange/<varname>mail box path</varname>.</para>
+      <para>(Conditional) If you chose Microsoft Exchange as the server type, provide your username in the Username field and your Outlook Web Access (OWA) URL in the OWA URL field. The URL and the usernames should use the Outlook format.If the mailbox path is different from the username, the OWA path should also include mailbox path, for example http://<varname>server name</varname>/exchange/<varname>mail box path</varname>.</para>
       <para></para>
       <para>When you have finished, continue with <link linkend="more-mail-options">Receiving Mail Options</link>.</para>
      </section>
@@ -386,7 +386,7 @@
         <para>The GAL contains a list of all e-mail addresses. If you select this option, you need to specify the maximum number of responses.</para>
        </listitem>
        <listitem id="bstgsrp">
-        <para>Select if you want to use a password expire warning time period.</para>
+        <para>Select if you want use a password expire warning time period.</para>
         <para>If you select this option, you need to specify how often Evolution should send the password expire message.</para>
        </listitem>
        <listitem id="bv6uqm7">
@@ -629,7 +629,7 @@
        
       </listitem>
       <listitem id="b10fn8up">
-       <para>Click OK, then click Apply.</para>
+       <para>Click OK, then click Apply. </para>
        <para>Evolution opens with your new account created.</para>
       </listitem>
      </orderedlist>
@@ -643,7 +643,7 @@
      <para>Before importing e-mail from Netscape&z-3rdParty;, make sure you have selected File &gt; Compact All Folders. If you don&apos;t, Evolution will import and undelete the messages in your Trash folders.</para>
      <tip>
       <para>Evolution uses standard file types for e-mail and calendar information, so you can copy those files from your <command>~/.evolution</command> directory. The file formats used are <command>mbox</command> for e-mail and iCal for calendar information.</para>
-      <para>Contacts files are stored in a database, but can be saved as a standard vCard&z-3rdParty;. To export contact data, open your contacts tool and select the contacts you want to export (press Ctrl+A to select them all). Click File &gt; Save Contact as VCard. </para>
+      <para>Contacts files are stored in a database, but can be saved as a standard vCard&z-3rdParty;. To export contact data, open your contacts tool and select the contacts you want to export (press Ctrl+A to select them all). Click File &gt; Save as VCard. </para>
      </tip>
     </section>
    </section>
@@ -652,7 +652,7 @@
   <section id="ui-intro">
    <title>Using Evolution: An Overview</title>
    <para>Now that the first-run configuration has finished, you&apos;re ready to begin using Evolution. Here&apos;s a quick explanation of what&apos;s happening in your main Evolution window. </para>
-   <mediaobject id="bsaelj0"><imageobject><imagedata format="PNG" fileref="figures/evo_mail_callout_a.png"/></imageobject></mediaobject>
+   <mediaobject id="b159qfov"><imageobject><imagedata format="PNG" fileref="figures/evo_mail_callout_a.png"/></imageobject></mediaobject>
    <bridgehead id="bt4cke6">Menu Bar</bridgehead>
    <para>The menu bar gives you access to most Evolution features. For additional information, see <link linkend="usage-mainwindow-menubar">The Menu Bar</link>.</para>
    <bridgehead id="bt4cke7">Folder List</bridgehead>
@@ -705,7 +705,7 @@
 
    <section id="usage-mainwindow-shortcutbar">
     <title>The Shortcut Bar</title>
-    <para>The most important job for Evolution is to give you access to your information and help you use it quickly. One way it does that is through the shortcut bar, which is the column on the left side of the main window. The buttons, such as Mail and Contacts, are the shortcuts. Above them is a list of folders for the current Evolution tool.</para>
+    <para>The most important job for Evolutions is to give you access to your information and help you use it quickly. One way it does that is through the shortcut bar, which is the column on the left side of the main window. The buttons, such as Mail and Contacts, are the shortcuts. Above them is a list of folders for the current Evolution tool.</para>
     <para>The folder list organizes your e-mail, calendars, contact lists, and task lists in a tree, similar to a <link linkend="filetree">file tree</link>. Most people find one to four folders at the base of the tree, depending on the tool and their system configuration. Each Evolution tool has at least one folder, called On This Computer, for local information. For example, the folder list for the e-mail tool shows any remote e-mail storage you have set up, plus local folders and search folders, which are discussed in <link linkend="usage-mail-organize-vfolders">Using Search Folders</link>. </para>
     <para>If you get large amounts of e-mail, you might want more folders than just your Inbox. You can create multiple calendar, task, or contacts folders. </para>
     <para>To create a new folder:</para>
@@ -782,7 +782,7 @@
      </listitem>
     </itemizedlist>
     <para>However, Evolution has some important differences from other e-mail programs. First, it&apos;s built to handle very large amounts of e-mail. The <link linkend="usage-mail-organize-spam">junk e-mail</link>, message <link linkend="usage-mail-organize-filters">filtering</link> and <link linkend="usage-mail-organize-search">searching</link> functions were built for speed and efficiency. There&apos;s also the <link linkend="usage-mail-organize-vfolders">search folder</link>, an advanced organizational feature not found in some e-mail clients. If you get a lot of e-mail, or if you keep every message you get in case you need to refer to it later, you&apos;ll find this feature especially useful. Here&apos;s a quick explanation of what&apos;s happening in your main Evolution e-mail window. </para>
-    <mediaobject id="usage-mail-intro-fig"><imageobject><imagedata format="PNG" fileref="figures/evo_mail_a.png"/></imageobject></mediaobject>
+    <mediaobject id="b159qi3q"><imageobject><imagedata format="PNG" fileref="figures/evo_mail_a.png"/></imageobject></mediaobject>
     <bridgehead id="bt4ckee">Message List</bridgehead>
     <para>The message list displays all the e-mails that you have. This includes all your read and unread messages, and e-mail that is flagged to be deleted.</para>
     <bridgehead id="bt4ckef">Preview Pane</bridgehead>
@@ -796,7 +796,7 @@
    <section id="basics-calendar">
     <title>The Calendar</title>
     <para>To begin using the calendar, click Calendar in the shortcut bar. By default, the calendar shows today&apos;s schedule on a ruled background. At the upper right, there&apos;s a monthly calendar you can use to switch days. Below that, there&apos;s a Task list, where you can keep a list of tasks separate from your calendar appointments.</para>
-    <mediaobject id="usage-calendar-fig"><imageobject><imagedata format="GIF" fileref="figures/evo_cal_callout_a.gif"/></imageobject></mediaobject>
+    <mediaobject id="usage-calendar-fig"><imageobject><imagedata format="PNG" fileref="figures/evo_cal_callout_a.png"/></imageobject></mediaobject>
     <bridgehead id="bt4ckeg">Appointment List</bridgehead>
     <para>The appointment list displays all your scheduled appointments.</para>
     <bridgehead id="bt4ckeh">Month Pane</bridgehead>
@@ -931,9 +931,72 @@
     <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>
    </tip>
 
+   <section id="b131ni8g">
+    <title>Vertical View Vs Classical View</title>
+    <para>Evolution provides you vertical view in addition to the classical view. In the vertical view, message preview pane is located at the right side of the message pane when compared to the Classical view where the message preview pane is placed below the message pane. Vertical View enables you to use the extra width of the wide screen monitors.</para>
+    <formalpara id="b131nl11">
+     <title>Vertical View:</title>
+     <para>To swich to vertical view</para>
+    </formalpara>
+    <orderedlist>
+     <listitem id="b131nk3o">
+      <para>Click View &gt;Preview &gt;Vertical View</para>
+     </listitem>
+    </orderedlist>
+    <para>Evolution differs from the major email clients in the way it displays messages. 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>
+     <para>To swich to classical view</para>
+    </formalpara>
+    <orderedlist>
+     <listitem id="b131nkhr">
+      <para>Click View &gt;Preview &gt;Classical View</para>
+     </listitem>
+    </orderedlist>
+   </section>
+
+   <section id="b131oj36">
+    <title>Collapsible Message Headers</title>
+    <para>Evolution compresses the TO, CC, BCC headers received in the mails and shows only the first predefined limit. You can set a limit on the number of addresses to be displayed in the preview pane.</para>
+    <mediaobject id="b159qo4q"><imageobject><imagedata format="PNG" fileref="figures/collap_head_a.png"/></imageobject></mediaobject>
+    <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>
+     </listitem>
+     <listitem id="b131onsx">
+      <para>Select Mail Preferences</para>
+     </listitem>
+     <listitem id="b131onvr">
+      <para>Check the &ldquo;Shrink the To/CC/Bcc headers to&rdquo; column to limit the address</para>
+     </listitem>
+     <listitem id="b131oo0c">
+      <para>Enter the limit in the field.</para>
+     </listitem>
+    </orderedlist>
+    <para>You can expand the message headers by click the  <inlinegraphic format="PNG" fileref="figures/plus.png"/> icon or the &rsquo;...&rsquo; in the message preview pane. To collapse click  <inlinegraphic format="PNG" fileref="figures/minus.png"/> icon in the  preview pane.</para>
+   </section>
+
    <section id="usage-mail-listorder">
     <title>Sorting the Message List</title>
     <para>Evolution helps you work by letting you sort your e-mail. To sort by sender, subject, or date, click the bars with those labels at the top of the message list. The direction of the arrow next to the label indicates the direction of the sort. Click again, to sort them in reverse order. For example, click Date to sort messages by date from oldest to newest. Click again, and Evolution sorts the list from newest to oldest. You can also right-click the message header bars to get a set of sorting options, and to add or remove columns from the message list. You can find detailed instructions on how to customize your message display columns in <link linkend="usage-mail-organize-columns">Sorting Mail with Column Headers</link>.</para>
+    <para>In addition to it, Evolution enables you to sort your messages by using Sort-by list.You can use any of the criteria given in the Sort-by list such as <emphasis>sender, location,to, from, size, </emphasis>and so forth to perform sorting. It returns the sorted email list that matches the criteria you have selected.</para>
+    <para>To sort e-mails, perform the following procedure:</para>
+    <orderedlist>
+     <listitem id="b131itxb">
+      <para>Right click message header bar.</para>
+     </listitem>
+     <listitem id="b131iu51">
+      <para>Click Sort by.</para>
+     </listitem>
+     <listitem id="b131iudb">
+      <para>Select the search criteria.</para>
+     </listitem>
+    </orderedlist>
+    <note>
+     <para>You can also sort your e-mails by date in ascending or descending order. For that,you need to right click  the  message header bar and then click  Sort Ascending/Sort Descending, Evolution returns you the sorted e-mail list in the order of oldest to latest/newest to oldest respectively.</para>
+    </note>
     <para>To look at the complete headers for a message, click View &gt; Message Display &gt; Show Full Headers. To see all message data, click View &gt; Message Display &gt; Show E-Mail Source. </para>
     <para>You can also choose a threaded message view. Click View &gt; Threaded Message List to turn the threaded view on or off. When you select this option, Evolution groups the replies to a message with the original, so you can follow the thread of a conversation from one message to the next.</para>
     <mediaobject id="bs4aw7h"><imageobject><imagedata format="PNG" fileref="figures/mail-threaded.png"/></imageobject></mediaobject>
@@ -951,7 +1014,7 @@
 
    <section id="usage-mail-getnsend-undelete">
     <title>Undeleting Messages</title>
-    <para>You can undelete a message that has been deleted but not expunged. To undelete a message, select the message, then press Shift+Ctrl+D, or click Edit &gt; Undelete.</para>
+    <para>You can undelete a message that has been deleted but not expunged. To undelete a message, select the message, then press Ctrl+U, or click Edit &gt; Undelete.</para>
     <para>If you have marked a message for deletion, undeleting it unmarks it, and the message is removed from the Trash folder. You cannot undelete messages that have been expunged. </para>
    </section>
   </section>
@@ -1001,7 +1064,7 @@
 
    <section id="usage-mail-getnsend-get-attach">
     <title>Working with Attachments and HTML Mail</title>
-    <para>If someone sends you an <link linkend="attachment">attachment</link>, Evolution displays a file icon at the end of the message to which it&apos;s attached. Text, including HTML formatting and embedded images, appears as part of the message, rather than as a separate attachment. Attachments are also listed on the top bar of the message. To view the attachments, click the arrow to expand the attachment window. To open an attachment, double-click it. Click the Save All button save all the attachments.</para>
+    <para>If someone sends you an <link linkend="attachment">attachment</link>, Evolution displays a file icon at the end of the message to which it&apos;s attached. Text, including HTML formatting and embedded images, appears as part of the message, rather than as a separate attachment. Attachments are also listed on the top bar of the message. To view the attachments, click the arrow to expand the attachment window. To open an attachment, double-click the it. Click the Save All button save all the attachments.</para>
 
     <section id="usage-mail-getnsend-get-attach-actions">
      <title>Saving or Opening Attachments</title>
@@ -1022,7 +1085,7 @@
      <para>To open an attachment using another application: </para>
      <orderedlist>
       <listitem id="bsen4ia">
-       <para>Click the down-arrow on the attachment icon or right-click the attachment icon in the attachment bar.</para>
+       <para>Click the down-arrow on the attachment icon or right-click the attachment icon in the attachment bar</para>
       </listitem>
       <listitem id="bsen4kb">
        <para>Select the application to open the attachment.</para>
@@ -1455,13 +1518,13 @@
 
    <section id="usage-mail-getnsend-fwd">
     <title>Forwarding Mail</title>
-    <para>When you receive an e-mail, you can forward it to other individuals or groups that might be interested. You can forward a message as an attachment to a new message (this is the default) or you can send it <link linkend="inline">inline</link> as a quoted portion of the message you are sending. Attachment forwarding is best if you want to send the full, unaltered message to someone else. Inline forwarding is best if you want to send portions of a message, or if you have a large number of comments on different sections of the message you are forwarding. Remember to note from whom the message came, and whether you have removed or altered content.</para>
+    <para>When you receive an e-mail, you can forward it to other individuals or groups that might be interested. You can forward a message as an attachment to a new message (this is the default) or you can send it <link linkend="inline">in	line</link> as a quoted portion of the message you are sending. Attachment forwarding is best if you want to send the full, unaltered message to someone else. Inline forwarding is best if you want to send portions of a message, or if you have a large number of comments on different sections of the message you are forwarding. Remember to note from whom the message came, and whether you have removed or altered content.</para>
     <para>To forward a message you are reading: </para>
     <orderedlist>
      <listitem id="b10fnnjq">
       <para>Click Forward on the toolbar.</para>
       <para>or</para>
-      <para>If you prefer to forward the message <link linkend="inline">inline</link> instead of attached, click Message &gt; Forward as &gt; Inline from the menu.</para>
+      <para>If you prefer to forward the message <link linkend="inline">inline</link> instead of attached, click Actions &gt; Forward Inline from the menu.</para>
      </listitem>
      <listitem id="b10fnnnk">
       <para>Select an addressee as you would when sending a new message; the subject is already entered, although you can alter it if you want.</para>
@@ -1617,7 +1680,7 @@
     <para>If you want, you can upload your keys to a key server.</para>
     <orderedlist>
      <listitem id="bsg3379">
-      <para>Check your public key ID with gpg --list-keys. It is the string after 1024D on the line beginning with pub. In the example above, it is 32j38dk2.</para>
+      <para>Check your public key ID with gpg--list-keys. It is the string after 1024D on the line beginning with pub. In the example above, it is 32j38dk2.</para>
      </listitem>
      <listitem id="bsg347p">
       <para>Enter the command <command>gpg --send-keys --keyserver wwwkeys.pgp.net <varname>32j38dk2</varname></command>. Substitute your key ID for <varname>32j38dk2</varname>. You need your password to do this.</para>
@@ -1842,7 +1905,7 @@
       <para>Use the Evolution import tool to import the files.</para>
      </listitem>
     </orderedlist>
-    <para>For POP mail, filters are applied as messages are downloaded. For IMAP mail, filters are applied to new messages when you open the Inbox folder. On Exchange servers, filters are not applied until you select your Inbox folder and click Message &gt; Apply Filters, or press Ctrl+Y. To force your filters to act on all messages in the folder, select the entire folder by pressing Ctrl+A, then apply the filters by pressing Ctrl+Y. </para>
+    <para>For POP mail, filters are applied as messages are downloaded. For IMAP mail, filters are applied to new messages when you open the Inbox folder. On Exchange servers, filters are not applied until you select your Inbox folder and click Actions &gt; Apply Filters, or press Ctrl+Y. To force your filters to act on all messages in the folder, select the entire folder by pressing Ctrl+A, then apply the filters by pressing Ctrl+Y. </para>
    </section>
   </section>
 
@@ -1905,47 +1968,135 @@
 
   <section id="usage-mail-organize-search">
    <title>Searching for Messages</title>
-   <para>Most mail clients can search your messages for you, but Evolution does it faster than most because of its automatic search index.</para>
-   <para>To start searching, type a word or phrase in the text area below the toolbar, and choose a search type:</para>
-   <formalpara id="bsaz7v9">
-    <title>Subject or Sender Contains: </title>
-    <para>Shows messages where the search text is in the subject line. It does not search in the message body.</para>
-   </formalpara>
-   <formalpara id="bsaz857">
-    <title>Subject Does Not Contain: </title>
-    <para>Finds messages that do not contain the search text in the subject.</para>
-   </formalpara>
-   <formalpara id="bsaz8as">
-    <title>Sender Contains: </title>
-    <para>Finds messages whose From: header contains a match for your search text.</para>
-   </formalpara>
-   <formalpara id="bsaz8eu">
-    <title>Recipients Contain: </title>
-    <para>Finds messages with the search text in the To: and Cc: headers.</para>
-   </formalpara>
-   <formalpara id="bsaz8kw">
-    <title>Body Contains: </title>
-    <para>Searches only in message text, not the subject lines.</para>
-   </formalpara>
-   <formalpara id="bsaz8ps">
-    <title>Body Does Not Contain: </title>
-    <para>Finds every e-mail message that does not have the search text in the message body. It also show messages that have the search text in the subject line, if it is not also in the body.</para>
+   <para>Most email clients can search the message for you, but Evolution does it differently and efficiently giving you faster search result with Quick search and Customized Search.</para>
+   <formalpara id="b131j1jn">
+    <title>Quick Search:</title>
+    <para>Quick Search displays all the messages that match the in-built criterias you selected from the drop-down list at the top left side, just above the message pane.</para>
    </formalpara>
-   <formalpara id="bsaz8uh">
-    <title>Body or Subject Contains: </title>
-    <para>Searches message subjects and the messages themselves for the word or phrase you&apos;ve specified in the search field.</para>
-   </formalpara>
-   <formalpara id="bsaz910">
-    <title>Message Contains: </title>
-    <para>Searches the message body and all headers for the specified text.</para>
-   </formalpara>
-   <formalpara id="b10ac746">
-    <title>Advanced Search: </title>
-    <para>Invokes the advanced search dialog box.</para>
+   <para>To perform quick search, perform the following procedure:</para>
+   <orderedlist>
+    <listitem id="b131j296">
+     <para>Click Show to expand the drop-down list.</para>
+    </listitem>
+    <listitem id="b131j2j8">
+     <para>Select the search criteria from the list</para>
+     <itemizedlist>
+      <listitem>
+       <para>All Messages</para>
+      </listitem>
+      <listitem>
+       <para>Unread Messages</para>
+      </listitem>
+      <listitem>
+       <para>No Label</para>
+      </listitem>
+      <listitem>
+       <para>Important</para>
+      </listitem>
+      <listitem>
+       <para>Work</para>
+      </listitem>
+      <listitem>
+       <para>Personal</para>
+      </listitem>
+      <listitem>
+       <para>To do</para>
+      </listitem>
+      <listitem>
+       <para>Later</para>
+      </listitem>
+      <listitem>
+       <para>Read Messages</para>
+      </listitem>
+      <listitem>
+       <para>Recent Messages</para>
+      </listitem>
+      <listitem>
+       <para>Last 5 day&rsquo;s Messages</para>
+      </listitem>
+      <listitem>
+       <para>Messages with Attachments</para>
+      </listitem>
+      <listitem>
+       <para>Important Messages</para>
+      </listitem>
+      <listitem>
+       <para>Messages not Junk</para>
+      </listitem>
+     </itemizedlist>
+    </listitem>
+    <listitem id="b131j6sl">
+     <para>Evolution displays the messages matching the criteria present in the shown message list</para>
+    </listitem>
+   </orderedlist>
+   <tip>
+    <para>You can even perform a quick search on a customized search results as it just filters and displays  the messages in the message list.</para>
+   </tip>
+   <formalpara id="b131jgie">
+    <title>Customized Search:</title>
+    <para>Evolution allows you to perform customized search.To search for a message use the following procedure:</para>
    </formalpara>
-   <para>When you&apos;ve typed your search phrase, press Enter or click the Find Now button. Evolution shows your search results in the message list.</para>
-   <para>For more complex search rules, select Advanced from the Search menu. You might want to create a search folder instead; see <link linkend="usage-mail-organize-vfolders">Using Search Folders</link> for more detail.</para>
-   <para>When you have finished searching, go back to seeing all your messages by clicking the Clear button, or by entering a blank search.</para>
+   <orderedlist>
+    <listitem id="b131jhwt">
+     <para>Click search icon <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to specify the search type</para>
+     <formalpara id="b131lvi6">
+      <title>Subject or Sender Contain:</title>
+      <para>Shows messages where the search text is in the subject line. It does not search in the message body.</para>
+     </formalpara>
+     <formalpara id="b131lvwy">
+      <title>Subject Does Not Contain:</title>
+      <para>Finds messages that do not contain the search text in the subject</para>
+     </formalpara>
+     <formalpara id="b131lwe2">
+      <title>Sender Contain:</title>
+      <para>Finds messages whose From: header contains a match for your search text.</para>
+     </formalpara>
+     <formalpara id="b131lx1i">
+      <title>Recpients Contain:</title>
+      <para>Finds messages with the search text in the To: and Cc: headers.</para>
+     </formalpara>
+     <formalpara id="b131lxie">
+      <title>Body Contains:</title>
+      <para>Searches only in message text, not the subject lines.</para>
+     </formalpara>
+     <formalpara id="b131lxul">
+      <title>Body Does Not Contain:</title>
+      <para>Finds every e-mail message that does not have the search text in the message body. It also show messages that have the search text in the subject line, if it is not also in the body.</para>
+     </formalpara>
+     <formalpara id="b131lyb1">
+      <title>Body or Subject Contain:</title>
+      <para>Searches message subjects and the messages themselves for the word or phrase you&apos;ve specified in the search field.</para>
+     </formalpara>
+     <formalpara id="b131m01u">
+      <title>Message Contains</title>
+      <para>:Searches the message body and all headers for the specified text.</para>
+     </formalpara>
+    </listitem>
+    <listitem id="b131m0yx">
+     <para>Click the in dropdown list to select the scope</para>
+     <itemizedlist>
+      <listitem>
+       <para>Current Folder</para>
+      </listitem>
+      <listitem>
+       <para>Current Account</para>
+      </listitem>
+      <listitem>
+       <para>All Accounts</para>
+      </listitem>
+      <listitem>
+       <para>Current Message</para>
+      </listitem>
+     </itemizedlist>
+    </listitem>
+    <listitem id="b131m1yz">
+     <para>Type the search string in the search entry and press Enter.</para>
+    </listitem>
+   </orderedlist>
+   <para>Evolution shows your search results in the message list. You might want to create a search folder instead; see <link linkend="usage-mail-organize-vfolders">Using Search Folders</link> for more detail.</para>
+   <note>
+    <para>When you have finished searching, go back to seeing all your messages by clicking the Clear button, or by entering a blank search.</para>
+   </note>
   </section>
 
   <section id="usage-mail-organize-spam">
@@ -2381,15 +2532,30 @@
 
   <section id="contact-search">
    <title>Searching for Contacts</title>
+   <formalpara id="b131mz65">
+    <title>Customized Search:</title>
+    <para>Evolution enables you to find the contact address quickly by using Customized Search. To find the contact address you are looking for, use the following procedure:</para>
+   </formalpara>
    <orderedlist>
-    <listitem id="bsb04h7">
-     <para>Select your search type in the search bar.</para>
+    <listitem id="b131m9n2">
+     <para>Click <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to expand the drop down list.</para>
     </listitem>
-    <listitem id="bsb04kf">
-     <para>Specify your query.</para>
+    <listitem id="b131mb7o">
+     <para>specify the search criteria from any of the following:</para>
+     <itemizedlist>
+      <listitem>
+       <para>Name Begin With</para>
+      </listitem>
+      <listitem>
+       <para>Email Begin With</para>
+      </listitem>
+      <listitem>
+       <para>Any Field Contains</para>
+      </listitem>
+     </itemizedlist>
     </listitem>
-    <listitem id="bsb04m3">
-     <para>Press Enter to begin the search.</para>
+    <listitem id="b131mgp9">
+     <para>Press Enter to begin the search</para>
     </listitem>
    </orderedlist>
    <para>For a more complex search, select Search Advanced and select criteria that describe your desired contact:</para>
@@ -2407,7 +2573,112 @@
      <para>Click Search.</para>
     </listitem>
    </orderedlist>
-   <para>To show all your contacts, Click Clear in the search bar or search with an empty query.</para>
+   <para>To show all your contacts, Click Clear in the search bar, press Shift+Ctrl+B, or search with an empty query.</para>
+   <formalpara id="b131mh80">
+    <title>Quick Search:</title>
+    <para>Displays all the contacts that match the in-built criteria you have selected from the drop-down list at the top left side, just above the Display pane.</para>
+   </formalpara>
+   <para>To perform quick search, use the following procedure:</para>
+   <orderedlist>
+    <listitem id="b131mjuy">
+     <para>Click <emphasis>Show</emphasis> to expand the drop-down list.</para>
+    </listitem>
+    <listitem id="b131mkao">
+     <para>Select the search criteria from any of the following:</para>
+     <itemizedlist>
+      <listitem>
+       <para>Anniversary</para>
+      </listitem>
+      <listitem>
+       <para>Birthday</para>
+      </listitem>
+      <listitem>
+       <para>Business</para>
+      </listitem>
+      <listitem>
+       <para>Competition</para>
+      </listitem>
+      <listitem>
+       <para>Favourites</para>
+      </listitem>
+      <listitem>
+       <para>Gifts</para>
+      </listitem>
+      <listitem>
+       <para>Goals/Objectives</para>
+      </listitem>
+      <listitem>
+       <para>Holiday</para>
+      </listitem>
+      <listitem>
+       <para>Holiday Cards</para>
+      </listitem>
+      <listitem>
+       <para>Hot Contacts</para>
+      </listitem>
+      <listitem>
+       <para>Ideas</para>
+      </listitem>
+      <listitem>
+       <para>International</para>
+      </listitem>
+      <listitem>
+       <para>Key Customer</para>
+      </listitem>
+      <listitem>
+       <para>Miscellaneous</para>
+      </listitem>
+      <listitem>
+       <para>Personal</para>
+      </listitem>
+      <listitem>
+       <para>Phone Calls</para>
+      </listitem>
+      <listitem>
+       <para>Status</para>
+      </listitem>
+      <listitem>
+       <para>Strategies</para>
+      </listitem>
+      <listitem>
+       <para>Suppliers</para>
+      </listitem>
+      <listitem>
+       <para>Time &amp;Expenses</para>
+      </listitem>
+      <listitem>
+       <para>VIP</para>
+      </listitem>
+      <listitem>
+       <para>Waiting</para>
+      </listitem>
+      <listitem>
+       <para>Weather:Cloudy</para>
+      </listitem>
+      <listitem>
+       <para>Weather:Fog</para>
+      </listitem>
+      <listitem>
+       <para>Weather:Partly Cloudy</para>
+      </listitem>
+      <listitem>
+       <para>Weather:Rain</para>
+      </listitem>
+      <listitem>
+       <para>Weather:Snow</para>
+      </listitem>
+      <listitem>
+       <para>Weather:Sunny</para>
+      </listitem>
+      <listitem>
+       <para>Weather:Thunderstorms</para>
+      </listitem>
+     </itemizedlist>
+    </listitem>
+    <listitem id="b131mqyi">
+     <para>Evolution displays the desired contacts.</para>
+    </listitem>
+   </orderedlist>
   </section>
 
   <section id="usage-contact-organize">
@@ -2728,7 +2999,7 @@
        </formalpara>
       </listitem>
      </itemizedlist>
-     <para>Apart from the above notifications, the Evolution alarm icon blinks in the notification area. To pause the alarm or view the event, click the notification icon.</para>
+     <para>Apart from the above notifications, the Evolution alarm icon blink in the notification area. To pause the alarm or view the event, click the notification icon.</para>
      <para>To create a reminder:</para>
      <orderedlist>
       <listitem id="bxmtait">
@@ -2895,7 +3166,7 @@ Accepting and Replying to a Meeting Request</title>
      </listitem>
      <listitem id="bsb0c7x">
       <para>Click the Free/Busy button on the toolbar, or click Options &gt; Free/Busy.</para>
-      <mediaobject id="bs4aw7i"><imageobject><imagedata format="PNG" fileref="figures/free-busy.png"/></imageobject></mediaobject>
+      <mediaobject id="bs4aw7i"><imageobject><imagedata format="PNG" fileref="figures/free_busy.png"/></imageobject></mediaobject>
       
      </listitem>
      <listitem id="b10fogwo">
@@ -2953,19 +3224,120 @@ Accepting and Replying to a Meeting Request</title>
 
   <section id="CHDJAEFJ">
    <title>Searching for Calendar Items</title>
-   <para>To start searching for various calendar items:</para>
+   <formalpara id="b131myk7">
+    <title>Customized Search:</title>
+    <para>Evolution enables you to find the Calender items by using Customized Search. To start searching for various calendar items, use the following procedure:</para>
+   </formalpara>
    <orderedlist>
-    <listitem id="b10fojuy">
-     <para>Type a word or phrase in the text area below the toolbar.</para>
+    <listitem id="b131n1cx">
+     <para>Click the search icon <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to expand the drop down list</para>
+    </listitem>
+    <listitem id="b131n2au">
+     <para>Select the search type</para>
+     <itemizedlist>
+      <listitem>
+       <para>Summary Contains</para>
+      </listitem>
+      <listitem>
+       <para>Description Contains</para>
+      </listitem>
+      <listitem>
+       <para>Category Contains</para>
+      </listitem>
+      <listitem>
+       <para>Location Contains</para>
+      </listitem>
+      <listitem>
+       <para>Any Field Contains</para>
+      </listitem>
+     </itemizedlist>
     </listitem>
-    <listitem id="b10fok2t">
-     <para>Chose a search type (Summary Contains, Description Contains, Category Contains, Location Contains, and Any Field Contains)</para>
+    <listitem id="b131n44f">
+     <para>Evolution displays the desired Calendar items.</para>
     </listitem>
-    <listitem id="b10fokf5">
-     <para>Click Find Now to perform the search.</para>
+   </orderedlist>
+   <formalpara id="b131n58d">
+    <title>Quick Search:</title>
+    <para>Displays all the Calendar items that match the in-built criterias that you have selected from the drop-down list at the top left side, just above the display pane</para>
+   </formalpara>
+   <para>To perform quick search, perform the following procedure:</para>
+   <orderedlist>
+    <listitem id="b131n6zv">
+     <para>Click <emphasis>Show</emphasis> to expand the drop down list</para>
     </listitem>
-    <listitem id="b10fokji">
-     <para>Press the Clear button to clear the active search.</para>
+    <listitem id="b131n7gu">
+     <para>Select the search criteria</para>
+     <itemizedlist>
+      <listitem>
+       <para>Unmatched</para>
+      </listitem>
+      <listitem>
+       <para>Anniversary</para>
+      </listitem>
+      <listitem>
+       <para>Birthday</para>
+      </listitem>
+      <listitem>
+       <para>Business</para>
+      </listitem>
+      <listitem>
+       <para>Competition</para>
+      </listitem>
+      <listitem>
+       <para>Favourites</para>
+      </listitem>
+      <listitem>
+       <para>Gifts</para>
+      </listitem>
+      <listitem>
+       <para>Goals/Objectives</para>
+      </listitem>
+      <listitem>
+       <para>Holidays</para>
+      </listitem>
+      <listitem>
+       <para>Holiday Cards</para>
+      </listitem>
+      <listitem>
+       <para>Ideas</para>
+      </listitem>
+      <listitem>
+       <para>International</para>
+      </listitem>
+      <listitem>
+       <para>Key Customers</para>
+      </listitem>
+      <listitem>
+       <para>Miscellaneous</para>
+      </listitem>
+      <listitem>
+       <para>Personal</para>
+      </listitem>
+      <listitem>
+       <para>Phone Calls</para>
+      </listitem>
+      <listitem>
+       <para>Status</para>
+      </listitem>
+      <listitem>
+       <para>Strategies</para>
+      </listitem>
+      <listitem>
+       <para>Suppliers</para>
+      </listitem>
+      <listitem>
+       <para>Time &amp; Expenses</para>
+      </listitem>
+      <listitem>
+       <para>VIP</para>
+      </listitem>
+      <listitem>
+       <para>Waiting</para>
+      </listitem>
+     </itemizedlist>
+    </listitem>
+    <listitem id="b131ndg2">
+     <para>Press Enter to display the desired Calendar items.</para>
     </listitem>
    </orderedlist>
   </section>
@@ -3004,7 +3376,7 @@ Accepting and Replying to a Meeting Request</title>
    <title>Multiple Calendars, Web Calendars, and CalDAV</title>
    <para>To create a new calendar, click File &gt; New &gt; Calendar. If the calendar is one you plan to store locally, you need only provide a name and color. If it is a remote calendar, specify the name, color, URL, and a refresh frequency. The refresh frequency determines how often Evolution checks to see if the calendar has changed. If you are working with someone who publishes an online calendar, you might want to check for updates every thirty minutes. On the other hand, if you have displayed a sports team schedule in your calendar, you might not need to refresh it more than once a week.</para>
    <para>The <ulink url="http://icalshare.com">icalshare.com Web site</ulink> has an extensive list of shared online calendars, including national and religious holidays, phases of the moon, sports, and local and regional events.</para>
-   <para>Evolution 2.6 lets you view and manage calendars on remote CalDAV servers such as Hula&reg;. For more information about Hula, see the <ulink url="http://www.hula-project.org">Hula Project Web site</ulink>. The procedure to create a CalDAV calendar source is similar to that of a remote Web calendar source. You can view and create calendar events on CalDav accounts just like other calendars on Evolution.</para>
+   <para>Evolution 2.8 lets you view and manage calendars on remote CalDAV servers such as Hula&reg;. For more information about Hula, see the <ulink url="http://www.hula-project.org">Hula Project Web site</ulink>. The procedure to create a CalDAV calendar source is similar to that of a remote Web calendar source. You can view and create calendar events on CalDav accounts just like other calendars on Evolution.</para>
   </section>
 
   <section id="usage-calendar-todo">
@@ -3205,7 +3577,7 @@ Accepting and Replying to a Meeting Request</title>
 
   <section id="bxqaqja">
    <title>Marcus Bains Line</title>
-   <para>The Marcus Bains Line is a marker to show the current date and time. This feature is now available in the Evolution 2.6 calendar.</para>
+   <para>The Marcus Bains Line is a marker to show the current date and time. This feature is now available in the Evolution 2.8 calendar.</para>
   </section>
  </chapter>
 
@@ -3364,7 +3736,7 @@ Accepting and Replying to a Meeting Request</title>
 
     <section id="config-easy">
      <title>Simple Configuration Tool for Evolution Exchange</title>
-     <para>Evolution Exchange 2.6 comes with a simple account creation tool for Exchange accounts.</para>
+     <para>Evolution Exchange 2.8 comes with a simple account creation tool for Exchange accounts.</para>
      <para>If you have no accounts configured, the simple account configuration assistant starts when you start Evolution. It asks only for the Outlook Web Access URL, and your username and password. Evolution Exchange determines the remaining information for you.</para>
      <para>If the simple account configuration tool does not run automatically, you need to create an account manually. For more information on how to do this, see <link linkend="config-exchange-new-account">Creating a New Exchange Account</link>.</para>
      <mediaobject id="bs4aw7j"><imageobject><imagedata format="PNG" fileref="figures/exchng-identity.png"/></imageobject></mediaobject>
@@ -3585,7 +3957,7 @@ Accepting and Replying to a Meeting Request</title>
   <section id="full-advantage">
    <title>Scheduling Appointments with Free/Busy</title>
    <para>When you schedule a meeting with your calendar on the Exchange server, you can check when other local Exchange users are busy according to their Exchange calendars.</para>
-   <mediaobject id="bs4aw7n"><imageobject><imagedata format="PNG" fileref="figures/free-busy.png"/></imageobject></mediaobject>
+   <mediaobject id="bs4aw7n"><imageobject><imagedata format="PNG" fileref="figures/free_busy.png"/></imageobject></mediaobject>
    <para>Reminders for appointments in your Exchange calendar do not work until you have run Evolution at least once after logging in. This is different from locally stored reminders, which work from the moment you log in, regardless of whether you have run Evolution in the session. </para>
    <orderedlist>
     <listitem id="bsbgc5a">
@@ -3607,7 +3979,7 @@ Accepting and Replying to a Meeting Request</title>
 
  <chapter id="usage-groupwise">
   <title>Connecting to GroupWise</title>
-  <para>Evolution&trade; 2.6 can access accounts on Novell&reg; GroupWise&reg; 7 system. </para>
+  <para>Evolution&trade; 2.8 can access accounts on Novell&reg; GroupWise&reg; 7 system. </para>
   <itemizedlist>
    <listitem>
     <para><link linkend="features">Evolution Exchange Features</link></para>
@@ -3873,7 +4245,7 @@ Accepting and Replying to a Meeting Request</title>
   <section id="bv7wck0">
    <title>Scheduling Appointments with Free/Busy</title>
    <para>When you schedule a meeting with your calendar on GroupWise, you can check when other local GroupWise users are busy according to their GroupWise calendars.</para>
-   <mediaobject id="bv7wag5"><imageobject><imagedata format="PNG" fileref="figures/free-busy.png"/></imageobject></mediaobject>
+   <mediaobject id="bv7wag5"><imageobject><imagedata format="PNG" fileref="figures/free_busy.png"/></imageobject></mediaobject>
    <para>Reminders for appointments in your GroupWise calendar do not work until you have run Evolution at least once after logging in. This is different from locally stored reminders, which work from the moment you log in, regardless of whether you have run Evolution in the session. </para>
    <orderedlist>
     <listitem id="bv7wal9">
@@ -4875,7 +5247,7 @@ Accepting and Replying to a Meeting Request</title>
      <para>Start Evolution.</para>
     </listitem>
     <listitem id="bshqejx">
-     <para>Select File &gt; New Folder to create the folders you want.</para>
+     <para>Press Shift+Ctrl+F or select File &gt; New Folder to create the folders you want.</para>
     </listitem>
    </orderedlist>
    <para>To import the data files:</para>
@@ -4926,19 +5298,19 @@ Accepting and Replying to a Meeting Request</title>
    <bridgehead id="bt4ckg2">New Item</bridgehead>
    <para>Press Ctrl+N to open a new item for whatever part of Evolution you&apos;re working in. In mail, this means you create a new message. If you&apos;re looking at your address book, Ctrl+N creates a new contact card, and in the calendar, a new appointment.</para>
    <bridgehead id="bt4ckg3">Creating a New E-Mail Message</bridgehead>
-   <para>Use File &gt; New &gt; Mail Message or Shift+Ctrl+M. </para>
+   <para>Use File &gt; New &gt; Mail Message or Ctrl+Shift+M. </para>
    <bridgehead id="bt4ckg4">Creating a New Appointment</bridgehead>
-   <para>Use File &gt; New Appointment or Shift+Ctrl+A.</para>
+   <para>Use File &gt; New Appointment or Ctrl+Shift+A.</para>
    <bridgehead id="bt4ckg5">Entering a New Contact </bridgehead>
-   <para> Double-click in any blank space in the contact manager to create a new address card. You can also use File &gt; New Contact or Shift+Ctrl+C. </para>
+   <para> Double-click in any blank space in the contact manager to create a new address card. You can also use File &gt; New Contact or Ctrl+Shift+C. </para>
    <bridgehead id="bt4ckg6">Creating a New Task</bridgehead>
-   <para> File &gt; New Task or Shift+Ctrl+T. </para>
+   <para> File &gt; New Task or Ctrl+Shift+T. </para>
   </section>
 
   <section id="quickref-mail">
    <title>Mail Tasks</title>
    <bridgehead id="bt4ckg7">Send and Receive Mail</bridgehead>
-   <para>Press F9, click the Send/Receive button in the toolbar, or click File &gt; Send/Receive.</para>
+   <para>Press F9, click the Send/Receive button in the toolbar, or click Actions &gt; Send/Receive.</para>
    <bridgehead id="bt4ckg8">Navigating the Message List with the Keyboard</bridgehead>
    <para>Press (]) or (.) to jump to the next unread message. ([) or (,) goes to the previous unread message. Use the arrow keys to move up and down in the list of all messages.</para>
    <bridgehead id="bt4ckg9">Moving the Display Up and Down in the Preview Pane</bridgehead>
@@ -4951,7 +5323,7 @@ Accepting and Replying to a Meeting Request</title>
    <bridgehead id="bt4ckgc">Opening a Message In a New Window</bridgehead>
    <para>Double-click the message you want to view, or select it and press Enter or Ctrl+O. </para>
    <bridgehead id="bt4ckgd">Creating Filters and Virtual Folders</bridgehead>
-   <para>Right-click a message and select Create Rule From Message. You can also create filters and virtual folders in the Edit menu. </para>
+   <para>Right-click a message and select Create Rule From Message. You can also create filters and virtual folders in the Tools menu. </para>
    <bridgehead id="bt4ckge">Adding a Sender to the Address Book</bridgehead>
    <para>Right-click a message and select Add Sender to Address Book. You can also right-click on any e-mail address to add it to your address book. </para>
   </section>
@@ -4959,10 +5331,10 @@ Accepting and Replying to a Meeting Request</title>
   <section id="quickref-cal">
    <title>Calendar</title>
    <bridgehead id="bt4ckgf">Creating a New Appointment</bridgehead>
-   <para> Use File &gt; New Appointment or Shift+Ctrl+A. </para>
+   <para> Use File &gt; New Appointment or Ctrl+Shift+A. </para>
    <para>You can also click in any blank spot in the calendar and start typing to create a new appointment entry.</para>
    <bridgehead id="bt4ckgg">Creating a New Task</bridgehead>
-   <para> Use File &gt; New Task or Shift+Ctrl+T. </para>
+   <para> Use File &gt; New Task or Ctrl+Shift+T. </para>
   </section>
 
   <section id="quickref-contact">
@@ -4974,7 +5346,7 @@ Accepting and Replying to a Meeting Request</title>
    <bridgehead id="bt4ckgj">Sending E-Mail To a Contact</bridgehead>
    <para>Right-click a contact, then click Send Message to Contact.</para>
    <bridgehead id="bt4ckgk">Creating a New Contact </bridgehead>
-   <para>Double-click in any blank space in the contact manager to create a new address card, or right-click anywhere in the address book and select New Contact. You can also click File &gt; New Contact or press Shift+Ctrl+C. </para>
+   <para>Double-click in any blank space in the contact manager to create a new address card, or right-click anywhere in the address book and select New Contact. You can also click File &gt; New Contact or press Ctrl+Shift+C. </para>
   </section>
  </appendix>
 
@@ -4989,7 +5361,7 @@ Accepting and Replying to a Meeting Request</title>
   <title>Authors</title>
   <para>Evolution was written by the Evolution&trade; team and numerous other dedicated GNOME programmers. You can see their names by clicking Help &gt; About from any Evolution window.</para>
   <para>The Evolution code owes a great debt to the GNOME-pim and GNOME-Calendar applications, and to KHTMLW. The developers of Evolution acknowledge the efforts and contributions of all who worked on those projects.</para>
-  <para>For more information please visit the Evolution <ulink url="http://www.novell.com/products/desktop/features/evolution.html">Web page</ulink>. Please send all comments, suggestions, and bug reports to the <ulink url="http://bugzilla.gnome.org">bug tracking database</ulink>. Instructions for submitting bug reports can be found on-line at the same location. You can also use the GNOME bug report tool, bug-buddy, to submit your defect reports.</para>
+  <para>For more information please visit the Evolution <ulink url="http://www.novell.com/products/desktop/features/evolution.html">Web page</ulink>. Please send all comments, suggestions, and bug reports to the <ulink url="http://bugzilla.ximian.com">bug tracking database</ulink>. Instructions for submitting bug reports can be found on-line at the same location. You can also use the GNOME bug report tool, bug-buddy, to submit your defect reports.</para>
   <para>This manual was written by:</para>
   <itemizedlist>
    <listitem>
@@ -5167,7 +5539,7 @@ Accepting and Replying to a Meeting Request</title>
   <glossentry id="regular-expression">
    <glossterm>regular expression</glossterm>
    <glossdef>
-    <para>A regular expression (regex) is a way of describing a string of text using metacharacters or wildcard symbols. For example, the statement fly.*so[au]p means any phrase beginning with &ldquo;fly&rdquo; and ending in &ldquo;soup&rdquo; or &ldquo;soap&rdquo;. If you searched for that expression, you&apos;d find both &ldquo;fly in my soup&rdquo; and &ldquo;fly in my soap.&rdquo; For more information, enter <command>man grep</command> from the command line.</para>
+    <para>A regular expression (regex) is a way of describing a string of text using metacharacters or wildcard symbols. For example, the statement fly.*so[au]p means any phrase beginning with &ldquo;fly&rdquo; and ending in &ldquo;oup&rdquo; or &ldquo;soap&rdquo;. If you searched for that expression, you&apos;d find both &ldquo;fly in my soup&rdquo; and &ldquo;fly in my soap.&rdquo; For more information, enter <command>man grep</command> from the command line.</para>
    </glossdef>
   </glossentry>
   <glossentry id="script">
@@ -5185,7 +5557,7 @@ Accepting and Replying to a Meeting Request</title>
   <glossentry id="vfolder">
    <glossterm>search folder</glossterm>
    <glossdef>
-    <para>An e-mail organization tool. Search folders allow you to create a folder that contains the results of a complex search. Search folder contents are updated dynamically.</para>
+    <para>An e-mail organization tool. Search folders allow you to create a folder that contains the results of a complex search. search folder contents are updated dynamically.</para>
    </glossdef>
   </glossentry>
   <glossentry id="search-scope">
@@ -5233,7 +5605,7 @@ Accepting and Replying to a Meeting Request</title>
   <glossentry id="vcard">
    <glossterm>vCard</glossterm>
    <glossdef>
-    <para>A file format for the exchange of contact information. When you get an address card attached to an e-mail, it&apos;s probably in vCard format.</para>
+    <para>A file format for the exchange of contact information. When you get an address card attached to an e-mail, it&apos;s probably in vCard format. Contrast with <varname>search folder</varname>.</para>
    </glossdef>
   </glossentry>
  </glossary>
@@ -5248,10 +5620,7 @@ Accepting and Replying to a Meeting Request</title>
     <member>Any products or technical information provided under this Agreement may be subject to U.S. export controls and the trade laws of other countries. You agree to comply with all export control regulations and to obtain any required licenses or classification to export, re-export, or import deliverables. You agree not to export or re-export to entities on the current U.S. export exclusion lists or to any embargoed or terrorist countries as specified in the U.S. export laws. You agree to not use deliverables for prohibited nuclear, missile, or chemical biological weaponry end uses. Please refer to www.novell.com/info/exports/ for more information on exporting Novell software. Novell assumes no responsibility for your failure to obtain any necessary export approvals.</member>
    </simplelist>
    <simplelist>
-    <member>Copyright &copy; 2005-2006 Novell, Inc. All rights reserved. No part of this publication may be reproduced, photocopied, stored on a retrieval system, or transmitted without the express written consent of the publisher.</member>
-   </simplelist>
-   <simplelist>
-    <member>Novell, Inc. has intellectual property rights relating to technology embodied in the product that is described in this document. In particular, and without limitation, these intellectual property rights may include one or more of the U.S. patents listed at http://www.novell.com/company/legal/patents/ and one or more additional patents or pending patent applications in the U.S. and in other countries.</member>
+    <member>Copyright &copy; 2004 Novell, Inc. All rights reserved. No part of this publication may be reproduced, photocopied, stored on a retrieval system, or transmitted without the express written consent of the publisher.</member>
    </simplelist>
    <simplelist>
     <member>Novell, Inc.</member>
@@ -5261,10 +5630,7 @@ Accepting and Replying to a Meeting Request</title>
     <member>www.novell.com</member>
    </simplelist>
    <para id="Bktitle">Evolution User Guide</para>
-   <para>March 23, 2006</para>
-   <simplelist>
-    <member>To access the online documentation for this and other Novell products, and to get updates, see www.novell.com/documentation.</member>
-   </simplelist>
+   <para>September 04, 2006</para>
    <simplelist>
     <member>Evolution is a trademark of Novell, Inc.</member>
     <member>GroupWise is a registered trademark of Novell, Inc. in the United States and other countries.</member>
@@ -5278,4 +5644,4 @@ Accepting and Replying to a Meeting Request</title>
     <member>All third-party trademarks are the property of their respective owners.</member>
    </simplelist>
   </appendix>
-</book>
+</book>
\ No newline at end of file
diff --git a/help/ChangeLog b/help/ChangeLog
index beecf93923..bf9baa05be 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-04  Harish Krishnaswamy  <kharish@novell.com>
+
+	* C/evolution.xml: Update the doc for Evolution 2.8.
+	Committing on behalf of Radhika Nair <pradhika@novell.com>
+
 2006-07-13  Andre Klapper  <a9016009@gmx.de>
 
 	* quickref/Makefile.am: