This and some more...

2003-05-19  Aaron Weber  <aaron@ximian.com>

	* C/config-prefs.xml: fix glossterms not to be inside
	<guilabel>s. None of these should be inside <term>s anyway.

2003-05-02  Aaron Weber  <aaron@ximian.com>

	* C/usage-mail-org.xml: Filter-new-fig.png

	* C/figures/filter-assist-fig.png: removed this figure image. Didn't need it and -new.
	* C/figures/small_desktop.png: removed this figure image. Not sure why we had it.
	* C/Makefile.am: remove filter-assist-fig.png,

2003-04-15  Aaron Weber  <aaron@ximian.com>

	* C/usage-exchange.xml: delegation

svn path=/trunk/; revision=21255

6 files changed, 265 insertions, 154 deletions

diff --git a/help/C/config-prefs.xml b/help/C/config-prefs.xml
index cf16bdb8a9..762def7f64 100644
--- a/help/C/config-prefs.xml
+++ b/help/C/config-prefs.xml
@@ -113,7 +113,7 @@
       </varlistentry>
 
       <varlistentry>
-	<term></guiicon>Directory Servers</guiicon></term>
+	<term><guiicon>Directory Servers</guiicon></term>
 	<listitem>
 	  <para>
              This item allows you to enter account information for
@@ -965,7 +965,7 @@ smtp.omniport.com:143
 	      Enter the server information as requested by the assistant:
 	    <variablelist>
 		<varlistentry>
-		  <term><guilabel>Server name</guilabel></term>
+		  <term>Server name</term>
 		  <listitem>
 		    <para>
 		      Address of the server where the addressbook is located.
@@ -973,7 +973,7 @@ smtp.omniport.com:143
 		  </listitem>
 		</varlistentry>
 		<varlistentry>
-		  <term><guilabel>Login Method</guilabel></term>
+		  <term>Login Method</term>
 		  <listitem>
 		    <para>
 		      Specify whether your login is anonymous, using
@@ -984,7 +984,7 @@ smtp.omniport.com:143
 		  </listitem>
 		</varlistentry>
 		<varlistentry>
-		  <term><guilabel>Port</guilabel></term>
+		  <term>Port</term>
 		  <listitem>
 		    <para>
 		      The internet port
@@ -995,7 +995,7 @@ smtp.omniport.com:143
 		  </listitem>
 		</varlistentry>
                 <varlistentry>
-                  <term><guilabel>Use SSL/TLS</guilabel></term>
+                  <term>Use SSL/TLS</term>
 		  <listitem>
 		    <para>
                       SSL and TLS are security mechanisms. If you
@@ -1011,24 +1011,26 @@ smtp.omniport.com:143
 
 
 		<varlistentry>
-		  <term><guilabel><glossterm linkend="search-base">Search base</glossterm></guilabel></term>
+		  <term>Search base</term>
 		  <listitem>
 		    <para>
-		      The base entry to use for all your searches.
-		      Contact your administrator for information about
+		      The <glossterm linkend="search-base">search
+                    base</glossterm> is the starting point for a directory search. 
+		      Contact your network administrator for information about
 		      the correct settings.
 		    </para>
 		  </listitem>
 		</varlistentry>
 		<varlistentry>
-		  <term><guilabel><glossterm linkend="search-scope">Search scope</glossterm></guilabel></term>
+		  <term>Search scope</term>
 		  <listitem>
 		    <para>
-		      How broad the search is in the directory.  The
-		      following options are available:
+                      The <glossterm linkend="search-scope">search
+                    scope</glossterm> is the breadth of a given search. 
+		    The  following options are available:
 		      <variablelist>
 			<varlistentry>
-			  <term><guilabel>One</</term>
+			  <term><guilabel>One</guilabel></term>
 			  <listitem>
 			    <para>
 			      Searches the Search Base and one entry
@@ -1051,7 +1053,7 @@ smtp.omniport.com:143
                 </varlistentry>
 
                 <varlistentry>
-                  <term><guilabel>Timeout Limit</guilabel></term>
+                  <term>Timeout Limit</term>
 		  <listitem>
 		    <para>
                       This is the maximum time Evolution will attempt to
@@ -1062,7 +1064,7 @@ smtp.omniport.com:143
 
 
                 <varlistentry>
-                  <term><guilabel>Download Limit</guilabel></term>
+                  <term>Download Limit</term>
 		  <listitem>
 		    <para>
 		      Set the maximum number of results for a given
@@ -1076,11 +1078,11 @@ smtp.omniport.com:143
 
 
                 <varlistentry>
-                  <term><guilabel>Display name</guilabel></term>
+                  <term>Display name</term>
 		  <listitem>
 		    <para>
-		      The name that you see on the screen.  This could
-		      be anything you wish.
+		      This is the name you will use to label this
+                      folder, and may be any name you choose.
 		    </para>
 		  </listitem>
 		</varlistentry>
diff --git a/help/C/usage-calendar.xml b/help/C/usage-calendar.xml
index 4f3f253440..6838b98fd8 100644
--- a/help/C/usage-calendar.xml
+++ b/help/C/usage-calendar.xml
@@ -522,8 +522,7 @@
 	<screenshot>
 	  <screeninfo>Appointment Scheduling Window</screeninfo>
 	  <mediaobject><imageobject>
-	      <imagedata  format="PNG" fileref="figures/schedule"
-	  srccredit="Kevin Breit"/>
+	      <imagedata  format="PNG" fileref="figures/schedule" srccredit="Kevin Breit"/>
 	    </imageobject></mediaobject>
 	</screenshot>
       </figure>
diff --git a/help/C/usage-exchange.xml b/help/C/usage-exchange.xml
index 2d5ed3104b..4d86881603 100644
--- a/help/C/usage-exchange.xml
+++ b/help/C/usage-exchange.xml
@@ -331,7 +331,7 @@ There are, however, some features which are not available:
          done so already, start Ximian
          Evolution and configure an account as described
          below.  Then, quit the application and place the
-         <systemitem>connector-key.data</systemitem> file in your
+         <systemitem>connector-key.txt</systemitem> file in your
          <systemitem>evolution</systemitem> directory. When you start
          Evolution again, the license will
          be verified and Ximian Connector will work properly.
@@ -381,10 +381,18 @@ There are, however, some features which are not available:
                       firewall.
                    </para>
 		  </listitem>
+
+		  <listitem>
+		    <para>
+                      Select the kind of authentication your network
+                      uses. You can click the <guibutton>Check for Supported
+                      Types</guibutton> button to see which kinds will work.
+                    </para>
+		  </listitem>
+
 		  <listitem>
 		    <para>
-                       If you would like
-                       Evolution to
+                       If you would like Evolution to
                        remember your password, check the box labeled
                        <guilabel>Remember this password</guilabel>.
                      </para>
@@ -419,6 +427,18 @@ There are, however, some features which are not available:
                       server, and many servers will refuse to return
                       more than 1000 results, no matter how many you
                       ask for.
+
+                  <note id="why-you-need-gal">
+                    <title>The Global Catalog Server</title>
+                    <para>
+                      The Global Catalog server provides you with
+                      access access to the Global Address List,
+                      free/busy information, and folder delegation
+                      features. These may not work properly if you do
+                      not have a Global Catalog server.
+                    </para>
+                  </note>
+
                      </para>
 		  </listitem>
 
@@ -428,28 +448,24 @@ There are, however, some features which are not available:
                       <itemizedlist>
                         <listitem>
                           <para>
-                            Exchange mailbox name is different
-                            from user name: If your exchange mailbox
-                            name is different from your user name,
-                            check this box and enter the mailbox name
-                            here.
+                            Exchange mailbox name: Enter your exchange
+                            mailbox name. The suggested value is
+                            probably correct.
                           </para>
                         </listitem>
                         <listitem>
                           <para>
-                            OWA path is not /exchange: In most cases,
+                            Outlook Web Access (OWA) Path: In most cases,
                             the URL for Outlook Web Access is
                             "http://server.company.com/exchange." If your
-                            system has a path that is not "/exchange," check
-                            the box and enter the custom path here.
+                            system has a URL that does not end in
+                            "/exchange," enter the custom path here.
                           </para>
                         </listitem>
                         <listitem>
                           <para>
-                            Public Folder Location: If your Exchange
-                            system has a custom or nonstandard Public
-                            Folder location, check this box and enter
-                            the URL for public folders here.
+                            Public Folder Server: Enter the name of
+                            your public folder server here.
                           </para>
                         </listitem>
                       </itemizedlist>
@@ -495,35 +511,6 @@ There are, however, some features which are not available:
           you're ready to get to work on the Exchange server.
         </para>
 
-	<figure>
-        <title>Creating an Exchange Account, Step One: Identity</title>
-	<screenshot>
-	  <screeninfo>Creating an Exchange Account, Step One: Identity</screeninfo>
-	  <mediaobject><imageobject>
-	      <imagedata  format="PNG" fileref="figures/exchange-identity" srccredit="Aaron Weber"/>
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-
-	<figure>
-        <title>Creating an Exchange Account, Step Two: Receiving Mail</title>
-	<screenshot>
-	  <screeninfo>Creating an Exchange Account, Step Two: Receiving Mail</screeninfo>
-	  <mediaobject><imageobject>
-	      <imagedata  format="PNG" fileref="figures/exchange-receive" srccredit="Aaron Weber"/>
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-
-	<figure>
-        <title>Creating an Exchange Account, Step Three: Mail Options</title>
-	<screenshot>
-	  <screeninfo>Creating an Exchange Account, Step Three: Mail Options</screeninfo>
-	  <mediaobject><imageobject>
-	      <imagedata  format="PNG" fileref="figures/exchange-receive-options" srccredit="Aaron Weber"/>
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
 
 
       </sect3>
@@ -537,6 +524,18 @@ There are, however, some features which are not available:
 	    to change settings in the following tabs of the account
 	    dialog:
 	  </para>
+
+	<figure>
+        <title>Exchange Account Settings: Identity</title>
+	<screenshot>
+	  <screeninfo>Creating an Exchange Account, Step One: Identity</screeninfo>
+	  <mediaobject><imageobject>
+	      <imagedata  format="PNG" fileref="figures/exchange-identity" srccredit="Aaron Weber"/>
+	    </imageobject></mediaobject>
+	</screenshot>
+      </figure>
+
+
 	  <variablelist>
 	    <varlistentry>
 	      <term>Identity</term>
@@ -548,6 +547,7 @@ There are, however, some features which are not available:
 	      </para>
 	      </listitem>
 	    </varlistentry>
+
 	    <varlistentry>
 	      <term>Receiving Mail</term>
 	      <listitem>
@@ -559,14 +559,31 @@ There are, however, some features which are not available:
 		  server supports SSL (Secure Socket Layer) encryption, it
 		  you can check the <guilabel>Use SSL</guilabel> box to
 		  take advantage of more secure data transfers.
+
+
+
+	<figure>
+        <title>Exchange Account Settings: Receiving Mail</title>
+	<screenshot>
+	  <screeninfo>Creating an Exchange Account, Step Two: Receiving Mail</screeninfo>
+	  <mediaobject><imageobject>
+	      <imagedata  format="PNG" fileref="figures/exchange-receive" srccredit="Aaron Weber"/>
+	    </imageobject></mediaobject>
+	</screenshot>
+      </figure>
+
 		</para>
+
+
 	      </listitem>
 	    </varlistentry>
+
+
 	    <varlistentry>
 	      <term>Receiving Options</term>
 	      <listitem>
 		  <para>
-		    Here, tab, you'll find some additional settings:
+		    Here, you'll find some additional settings:
 		    <variablelist>
 		     <varlistentry>
 		      <term>Checking for New Mail</term>
@@ -577,8 +594,29 @@ There are, however, some features which are not available:
 			 </para>
 		       </listitem>
 		    </varlistentry>
+		 
 		    <varlistentry>
-		      <term>Mailbox Name and Web Access Path</term>
+		      <term>Global Address List/Active Directory</term>
+		       <listitem>
+			 <para>
+			   The Global Address List (GAL) is an
+			   addressbook for everyone represented in
+			   your organization's Exchange deployment. To
+			   use the GAL, click the tab labeled
+			   <guilabel>Receiving Options</guilabel> and
+			   enter the name of your Global Catalog
+			   Server. The GAL is maintained by your
+			   system administrator and you cannot add,
+			   change, or remove items from it using
+			   Ximian Evolution. However, you can use it
+			   to invite people to meetings and to look up
+			   addresses and other information.
+			 </para>
+		       </listitem>
+		    </varlistentry>
+
+              <varlistentry>
+		      <term>Exchange Server</term>
 		       <listitem>
 			 <para>
 			   If your Exchange server requires you to use a
@@ -593,30 +631,26 @@ There are, however, some features which are not available:
 			  system has a path that is not "exchange," check
 			  the box and enter the custom path here.
 			 </para>
+                         <para>
+                            If your network uses a different server
+                            for Public Folders than for personal
+                            folders, enter its name here.
+                         </para>
 		       </listitem>
 		    </varlistentry>
-		    <varlistentry>
-		      <term>Active Directory</term>
-		       <listitem>
-			 <para>
-			   If you would like to use the Global Address
-			   List (GAL) maintained on your Exchange server,
-			   click the tab labeled <guilabel>Receiving
-			   Options</guilabel> and check the box labeled
-			   <guilabel>Create a Global Address List
-			   folder</guilabel>.  The GAL is maintained by
-			   your system administrator and you cannot add,
-			   change, or remove items from it using Ximian
-			   Evolution. However, you can use it to invite
-			   people to meetings and to look up addresses and
-			   other information. In many organizations, the
-			   GAL is stored on a different server from email.
-			   If this is the case, you should also specify
-			   the directory server name here.
-			 </para>
-		       </listitem>
-		    </varlistentry>
+
 		  </variablelist>
+
+	<figure>
+        <title>Exchange Account Settings: Receiving Mail</title>
+	<screenshot>
+	  <screeninfo>Creating an Exchange Account, Step Three: Mail Options</screeninfo>
+	  <mediaobject><imageobject>
+	      <imagedata  format="PNG" fileref="figures/exchange-receive-options" srccredit="Aaron Weber"/>
+	    </imageobject></mediaobject>
+	</screenshot>
+      </figure>
+
 		</para>
 	      </listitem>
 	    </varlistentry>
@@ -730,6 +764,18 @@ There are, however, some features which are not available:
           <guilabel>Private</guilabel>, or only to public items.
         </para>
 
+
+	<figure>
+        <title>Exchange Account Delegation</title>
+	<screenshot>
+	  <screeninfo>Exchange Account Delegation Settings</screeninfo>
+	  <mediaobject><imageobject>
+	      <imagedata  format="PNG" fileref="figures/exchange-delegation" srccredit="Aaron Weber"/>
+	    </imageobject></mediaobject>
+	</screenshot>
+      </figure>
+
+
         <para>
           For each of the four types of folder, you may select one of
           the following levels of access:
diff --git a/help/C/usage-mail-org.xml b/help/C/usage-mail-org.xml
index f279058e45..bb9b3c207c 100644
--- a/help/C/usage-mail-org.xml
+++ b/help/C/usage-mail-org.xml
@@ -572,6 +572,19 @@
 
 <para>
 
+   <figure id="usage-mail-filter-fig-createrule">
+	<title>Creating a Mail Filter</title>
+	<screenshot>
+	  <screeninfo>Creating a Mail Filter</screeninfo>
+	    <mediaobject>
+	      <imageobject>
+		<imagedata fileref="figures/filter-new-fig" format="PNG"
+			   srccredit="Aaron Weber"/>
+	      </imageobject>
+	    </mediaobject>
+	  </screenshot>
+	</figure>
+
       <note id="lots-of-filters">
         <title>What if Multiple Filters Match One Message?</title>
          <para>
@@ -1124,6 +1137,21 @@
 	      Select your search criteria. For each criterion, you
 	      must first select which of the following parts of the
 	      message you want the search to examine:
+
+      <figure id="usage-mail-vfolder-fig-createrule">
+	<title>Selecting a vFolder Rule</title>
+	<screenshot>
+	  <screeninfo>Creating a vFolder Rule</screeninfo>
+	    <mediaobject>
+	      <imageobject>
+		<imagedata fileref="figures/vfolder-createrule-fig" format="PNG"
+			   srccredit="Aaron Weber"/>
+	      </imageobject>
+	    </mediaobject>
+	  </screenshot>
+	</figure>
+      </para>
+       <para>
 	      <itemizedlist>
 		<listitem><para>
 		    Sender - The sender's address.
@@ -1270,20 +1298,7 @@
 	server; you must be connected to your mail server for the vFolder to
 	include any messages from that source.
       </para>
-      <para>
-      <figure id="usage-mail-vfolder-fig-createrule">
-	<title>Selecting a vFolder Rule</title>
-	<screenshot>
-	  <screeninfo>Creating a vFolder Rule</screeninfo>
-	    <mediaobject>
-	      <imageobject>
-		<imagedata fileref="figures/vfolder-createrule-fig" format="PNG"
-			   srccredit="Aaron Weber"/>
-	      </imageobject>
-	    </mediaobject>
-	  </screenshot>
-	</figure>
-      </para>
+   
     </sect2>
   </sect1>
 </chapter>
diff --git a/help/C/usage-mail.xml b/help/C/usage-mail.xml
index a1a3bcb018..4bb6f8c9d5 100644
--- a/help/C/usage-mail.xml
+++ b/help/C/usage-mail.xml
@@ -97,9 +97,9 @@
 	conversation from one message to the next.
       </para>
       <figure>
-        <title>Threaded Mail View</title>
+        <title>Message Threading In Action</title>
 	<screenshot>
-	  <screeninfo>Threaded Mail View</screeninfo>
+	  <screeninfo>Message Threading In Action</screeninfo>
 	  <mediaobject><imageobject>
 	      <imagedata  format="PNG" fileref="figures/mail-threaded" srccredit="Aaron Weber"/>
 	    </imageobject></mediaobject>
@@ -248,6 +248,22 @@
 	</listitem>
       </itemizedlist>
     </para>
+
+
+   <figure id="usage-mail-druid-pic">
+	<title>Mail Setup Assistant</title>
+	<screenshot>
+	  <screeninfo>Mail Setup Assistant</screeninfo>
+	    <mediaobject>
+	      <imageobject>
+		<imagedata fileref="figures/mail-druid-pic" format="PNG"
+			   srccredit="Aaron Weber"/>
+	      </imageobject>
+	    </mediaobject>
+	  </screenshot>
+	</figure>
+
+
     <para>
       To check your email, press the <guibutton>Check Mail</guibutton>
       button.  If this is your first time checking mail, or you
@@ -751,12 +767,12 @@
            <guilabel>To:</guilabel> and <guilabel>Subject:</guilabel>
            fields will already be filled, although you can alter them
            if you wish.  In addition, the full text of the old message
-           is inserted into the new message, either grey (for
-           HTML display) or with the &gt; character before each line
-           (in plain text mode), to indicate that it's part of the
-           previous message.  People often intersperse their message
-           with the quoted material as shown in <xref
-           linkend="usage-mail-getnsend-reply-fig"/>.
+           is inserted into the new message, either in grey with a
+           blue line to one side (for HTML display) or with the &gt;
+           character before each line (in plain text mode), to
+           indicate that it's part of the previous message.  People
+           often intersperse their message with the quoted material as
+           shown in <xref linkend="usage-mail-getnsend-reply-fig"/>.
 
  <!-- ==============Figure=================================== -->
        <figure id="usage-mail-getnsend-reply-fig">
diff --git a/help/C/usage-mainwindow.xml b/help/C/usage-mainwindow.xml
index 7d65fd382a..8d4d55fb2c 100644
--- a/help/C/usage-mainwindow.xml
+++ b/help/C/usage-mainwindow.xml
@@ -111,7 +111,7 @@
 	you will enter some basic personal information.  You can
 	define multiple identities later on with the
 	<menuchoice><guimenu>Tools</guimenu>
-	<guimenuitem>Configure</guimenuitem></menuchoice> tool and
+	<guimenuitem>Settings</guimenuitem></menuchoice> tool and
 	clicking the <guibutton>Mail Accounts</guibutton> button.
 	<itemizedlist>
 	  <listitem>
@@ -332,41 +332,43 @@
 	  </listitem>
 
 	  <listitem>
-	    <para>Mailbox Name is Different from Login Name: If your active directory user name
-	    is different from your Exchange mailbox name, check this
-	    box and enter your mailbox name here.
+	    <para>
+              Global Address List/Active Directory: Enter the name of
+              your global catalog server here. You may also choose to
+              limit the server's responses and select a maximum number
+              of results for an address search. A maximum number of
+              results limits the load on your system and on your
+              network.
+            </para>
+	  </listitem>
+
+	  <listitem>
+	    <para>Mailbox Name: If your active directory user name is
+	    different from your Exchange mailbox name, enter the
+	    mailbox name here.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Override Outlook Web Access Path: In most cases,
-	      the URL for web access is
-	      "http://server.company.com/exchange." If your
-	      system has a path that is not "exchange," check
-	      the box and enter the custom path here.
+	      Outlook Web Access (OWA) Path: In most cases, the URL
+	      for web access is "http://server.company.com/exchange."
+	      If your system has a path that is not "exchange," enter
+	      the appropriate value here.
 	     </para>
 	  </listitem>
 	  <listitem>
-	    <para>Create a Global Address List folder: If you want to
-	    use your organization's Active Directory or Global Address
-	    List, leave this box checked. </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-              Active Directory Server Name: Enter the Active Directory
-	      server name here.
-            </para>
+	    <para>Public Folder Server: Enter the name of your organization's public folder server, if any, here.</para>
 	  </listitem>
 
 	  <listitem>
-	    <para>Limit number of Responses: Select a maximum number
-	    of results for an address search. A maximum number of
-	    results limits the load on your system and on your network.
-              </para>
-	  </listitem>
-	</itemizedlist>
+	    <para>Apply filters to new messages in Inbox on this
+	    server: Check this box to use filters when you visit the
+	    Inbox for this account.
             </para>
 	  </listitem>
+        </itemizedlist>
+      </para>
+	  </listitem>
 	</varlistentry>
 	<varlistentry>
 	  <term>If you chose IMAP:</term>
@@ -472,13 +474,17 @@
 		  </para>
 		</listitem>
 	      </itemizedlist>
-	    </para>
-	  </listitem>
+            </para>
+          </listitem>
+        </itemizedlist>
+      </para>
+      <para>
+        If you choose SMTP, there are a few additional items to enter:
+        <itemizedlist>
 	  <listitem>
 	    <para>
-	      Host: If you chose <guilabel>SMTP</guilabel> or
-	      <guilabel>Microsoft Exchange</guilabel>, enter the
-	      server's name or IP address here.
+	      Host: enter your mail sending server's name or IP
+              address here.
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -799,7 +805,7 @@ the workaround described in the note below.
 	<screeninfo>Inbox</screeninfo>
 	  <mediaobject>
              <imageobject>
-                 <imagedata fileref="figures/mainwindow-pic" format="PNG" srccredit="Kevin Breit"/> 
+                 <imagedata fileref="figures/mainwindow-pic" format="PNG" srccredit="Aaron Weber"/> 
              </imageobject>
           </mediaobject>
       </screenshot>
@@ -860,6 +866,7 @@ the workaround described in the note below.
       with precision so you can easily find what you're looking for.
     </para>
 
+    
 
   <sect2 id="usage-mainwindow-shortcutbar">
     <title>The Shortcut Bar</title>
@@ -875,7 +882,7 @@ the workaround described in the note below.
         rectangular group buttons.
     </para>
     <para>
-       Take a look at the <guilabel>Shortcut Bar</guilabel>
+       Take a look at the <guilabel>Shortcut Bar</guilabel>.
        The shortcut buttons in that category are:
 
 	    <variablelist>
@@ -961,6 +968,20 @@ the workaround described in the note below.
       <guilabel>vFolders</guilabel>, or virtual folders, discussed in
       <xref linkend="usage-mail-organize-vfolders"/>,
     </para>
+
+
+    <figure id="mainwin-folderbar">
+      <title>Using the Folder Bar</title>
+      <screenshot>
+	<screeninfo>Inbox with Folder Bar</screeninfo>
+	  <mediaobject>
+             <imageobject>
+                 <imagedata fileref="figures/folder-bar" format="PNG" srccredit="Aaron Weber"/> 
+             </imageobject>
+          </mediaobject>
+      </screenshot>
+    </figure>
+    
     <para>
        
       A typical <guilabel>Local</guilabel> folder contains the following folders:
@@ -1277,13 +1298,7 @@ Shows you how many email messages you have in your selected folders, waiting to
 <inlinemediaobject><imageobject><imagedata fileref="figures/full-4" format="PNG"/></imageobject></inlinemediaobject> <guilabel>Calendar Summary</guilabel>
 </para>
 <para>
-Shows you your calendar.
-</para>
-<para>
-<inlinemediaobject><imageobject><imagedata fileref="figures/full-5" format="PNG"/></imageobject></inlinemediaobject> <guilabel>Tasks</guilabel>
-</para>
-<para>
-Shows your pending tasks
+Shows you your calendar. Tasks are displayed below calendar appointments.
 </para>
 
 
@@ -1356,7 +1371,7 @@ Shows your pending tasks
           <title>Ximian Evolution Mail</title>
           <screenshot>
             <screeninfo>Inbox</screeninfo>
-            <mediaobject><imageobject><imagedata  fileref="figures/mail-inbox" format="PNG" srccredit="Kevin Breit"/>
+            <mediaobject><imageobject><imagedata  fileref="figures/mail-inbox" format="PNG" srccredit="Aaron Weber"/>
         </imageobject></mediaobject>
         </screenshot>
       </figure>
@@ -1399,7 +1414,7 @@ Shows your pending tasks
       </para>
       <para>
         Most of the mail-related actions you'll want to perform are
-        listed in the <guimenu>Message</guimenu> menu in the menu bar.
+        listed in the <guimenu>Actions</guimenu> menu in the menu bar.
         The most frequently used ones, like
         <guimenuitem>Reply</guimenuitem> and
         <guimenuitem>Forward</guimenuitem>, also appear as buttons in
@@ -1463,18 +1478,21 @@ Shows your pending tasks
         <guilabel>Appointment List </guilabel> as it keeps track of
         tasks which don't have a time associated with them. Tasks can
         have complex notes associated with them, and you can also note
-        their completeness on a percentage scale.
+        their completeness on a percentage scale. To display more
+        information about your notes, drag the column border to the
+        left.
       </para>
 
       <para>
 	<inlinemediaobject><imageobject><imagedata  fileref="figures/full-3" format="PNG"/></imageobject></inlinemediaobject>
-	<guilabel>Calendar Window</guilabel>
+	<guilabel>Month Pane</guilabel>
       </para>
 
       <para>
-	The <guilabel>Calendar Window</guilabel> has a graphical representation of
-	the calendar, so you can select what days to view in the <guilabel>Appointment
-	List</guilabel>.
+	The month pane is a small view of your calendar by month.  To
+	display more months here, drag the column border to the left.
+	If you select a range of days in the month pane they will be
+	displayed <guilabel>Appointment List</guilabel>.
       </para>
 
       <para>
@@ -1530,9 +1548,24 @@ Shows your pending tasks
         format="PNG"/></imageobject></inlinemediaobject> <guilabel>Contact
         List</guilabel>
       </para>
+
       <para>
-        The <guilabel>Contact List</guilabel> lists your contacts.
+        The <guilabel>Contact List</guilabel> lists your contact cards.
+        You can also search through the cards in the same way 
+        that you search email folders, with the search bar just
+        above the contact list.
       </para>
+
+      <para>
+	<inlinemediaobject><imageobject><imagedata  fileref="figures/full-2" format="PNG"/></imageobject></inlinemediaobject>
+	<guilabel>Alphanumeric Shortcuts</guilabel>
+      </para>
+      <para> Click one of the buttons along the right side of the
+        window to view contacts that begin with the letter or number
+        you click.
+      </para>
+
+
       <para>
           For detailed instructions on how to use the address book,
           read <xref linkend="usage-contact"/>.