Update

svn path=/trunk/; revision=13711

1 files changed, 508 insertions, 171 deletions

diff --git a/help/no/usage-mainwindow.sgml b/help/no/usage-mainwindow.sgml
index 7d143d8488..7794c8c54f 100644
--- a/help/no/usage-mainwindow.sgml
+++ b/help/no/usage-mainwindow.sgml
@@ -3,32 +3,103 @@
 -->
 <chapter id="usage-mainwindow">
 
-  <title>The Evolution Workspace</title>
+  <title>Getting Started with Ximian Evolution</title>
+
+    <sect1 id="what"> 
+      <title>What is Ximian Evolution, and What Can It Do for Me?</title>
+      <para>
+        Information is useless unless it's organized and accessible;
+        it's hardly even worth the name if you can't look at it and be
+        <emphasis>informed</emphasis>.  The goal of
+        <application>Ximian Evolution</application> is to make the
+        tasks of storing, organizing, and retrieving your personal
+        information easier, so you can work and communicate with
+        others.  That is, it's a highly evolved <glossterm
+        linkend="groupware">groupware</glossterm> program, an integral
+        part of the Internet-connected desktop.
+      </para>
+      <para>
+        In other words, <application>Ximian Evolution</application> is
+        a tool to help you get your work done.
+      </para>
+      <para>
+        <application>Ximian Evolution</application> is Free Software.  The
+        program and its source code are released under the terms of
+        the GNU <ulink type="help"
+        url="gnome-help:gpl"><citetitle>General Public License
+        (GPL)</citetitle></ulink>, and the documentation falls under
+        the <ulink type="help" url="gnome-help:fdl"><citetitle>Free
+        Documentation License</citetitle></ulink> (FDL). For more
+        information about the GPL and the FDL, visit the Free Software
+        Foundation's website at <ulink
+        url="http://www.fsf.org">http://www.fsf.org</ulink>.
+      </para>
+
+      <para>
+        <application>Ximian Evolution</application> can help you work in a
+        group by handling email, address and other contact
+        information, and one or more calendars.  It can do that on one
+        or several computers, connected directly or over a network,
+        for one person or for large groups.
+      </para>
+
+    <para>
+      With <application>Ximian Evolution</application>, you can
+      accomplish your most common daily tasks faster.  For example, it
+      takes only one or two clicks to enter an appointment or an
+      address card sent to you by email, or to send email to a contact
+      or appointment.  <application>Ximian Evolution</application>
+      makes displays faster and more efficient, so searches are faster
+      and memory usage is lower.  People who get lots of mail will
+      appreciate advanced features like <link
+      linkend="usage-mail-organize-vFolders"> Virtual Folders</link>,
+      which let you save searches as though they were ordinary mail
+      folders.
+    </para>
+  </sect1>
+
   <sect1 id="usage-mainwindow-starting">
-    <title>The First Time you Start Evolution</title>
+    <title>The First Time you Start Ximian Evolution</title>
     <para>
-      Start <application>Evolution</application> by selecting
-      <guimenuitem>Evolution</guimenuitem> from your
-      <guimenu>Programs</guimenu> menu, or by typing
-      <command>evolution</command> at the command line.  The first
-      time you run the program, it will create a directory called
-      <filename>evolution</filename> in your home directory, where it
-      will keep all your <application>Evolution</application>-related
-      files. Then, it will offer to help you set up mail accounts and
-      import data from other applications.
+      To start <application>Ximian Evolution</application>, do either
+      of the following: 
+      <itemizedlist>
+      <listitem>
+      <para>
+      Select <menuchoice><guimenu>Programs</guimenu>
+      <guimenuitem>Evolution</guimenuitem> </menuchoice> from your
+      menu panel.
+      </para>
+      </listitem>
+
+      <listitem>
+      <para>
+      Type <command>evolution</command> at the command line.
+      </para>
+      </listitem>
+     </itemizedlist>
+     </para>
+ 
+ <para>
+     The first time you run the program, it will create a directory
+      called <filename>evolution</filename> in your home directory,
+      where it will store all of its local data.  Then, it will open a
+      first-run assistant to help you set up mail accounts and import
+      data from other applications.
     </para>
     <para>
-      The first screen welcomes you to the assistant.  It is estimated that
-      configuring your mail will take 2 to 5 minutes and importing mail will
-      take 1 to 2 minutes.
+      Using the first-run assistant will take approximately two to
+      five minutes.
     </para>
 
     <sect2 id="first-step">
-      <title>Step 1 of 4</title>
+      <title>Defining Your Identity</title>
       <para>
 	The Identity window is the first of four steps in the
 	assistant.  The identity step will ask you to enter your basic
-	personal information.
+	personal information.  You can define multiple identities
+	later on with the <menuchoice><guimenu>Tools</guimenu>
+	<guimenuitem>Mail Settings</guimenuitem></menuchoice> tool.
 	<itemizedlist>
 	  <listitem>
 	    <para>
@@ -60,15 +131,16 @@
     </sect2>
 
     <sect2 id="second-step">
-      <title>Step 2 of 4</title>
+      <title>Recieving Email</title>
       <para>
 	The <guilabel>Recieving Email</guilabel> step lets you configure
 	receving email people have sent you.
 	<itemizedlist>
 	  <listitem>
 	    <para>
-	      Server Type &mdash; There are numerous types of servers which
-	      <application>Evolution</application> can download your email from:
+	      Server Type &mdash; There are numerous types of servers
+	      from which <application>Ximian Evolution</application>
+	      can fetch your mail:
 	      <itemizedlist>
 		<listitem>
 		  <para>
@@ -78,21 +150,26 @@
 		</listitem>
 		<listitem>
 		  <para>
-		    IMAPv4 &mdash; Keeps the email on your server so you can
-		    access your email from any computer that supports IMAPv4 and
-		    have everything be the same.
+		    IMAPv4 &mdash; Keeps the email on your server so
+		    you can access your email from any computer that
+		    supports IMAPv4 and have everything be the
+		    same. For more information about how to use IMAP
+		    mail, see <xref
+		    linkend="usage-mail-subscriptions">.
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    Unix mbox spool-format file &mdash; Bad description, we're
-		    getting a better definition shortly.
+		    Unix mail spool file &mdash; If you run a mail
+		    server on your desktop computer, choose this optino.
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    Standard Unix mailbox file &mdash; Bad description, we're
-		    getting a better definition shortly.
+		    Standard Unix .mbox file &mdash; If you want
+		    <application>Ximian Evolution</application> to
+		    read mail from a specific file, or if you download
+		    mail with another application, choose this option.
 		  </para>
 		</listitem>
 		<listitem>
@@ -103,7 +180,7 @@
 		</listitem>
 		<listitem>
 		  <para>
-		    None &mdash How do you  have None?  figure out!
+		    None &mdash; How do you  have None?  figure out!
 		  </para>
 		</listitem>
 	      </itemizedlist>
@@ -123,19 +200,29 @@
 	    <para>
 	      Authentication Type &mdash; Chances are you are using
 	      <guilabel>Password</guilabel>.  Ask your administrator for more
-	      details.  You can have <application>Evolution</application> check
+	      details.  You can have <application>Ximian Evolution</application> check
 	      by clicking <guibutton>Check for supported types</guibutton>.
 	    </para>
 	    <para>
 	      Remember Password &mdash; If you prefer to not enter your
-	      password everytime you check email, press this button.
+	      password every time you check email, press this button.
 	    </para>
 	  </listitem>
 	</itemizedlist>
       </para>
+      <tip id="exchange-info">
+	<title>Can Ximian Evolution Talk to Exchange?</title>
+	<para>
+	  <application>Ximian Evolution</application> can work with the
+	   <application>Microsoft Exchange</application> server over
+	   standard protocols such as POP or IMAP. Check with your
+	   system administrator to see if you can get POP or IMAP
+	   access to your email server.
+	</para>
+      </tip> 
     </sect2>
     <sect2 id="third-step">
-      <title>Step 3 or 4</title>
+      <title>Sending Email</title>
       <para>
 	The <guilabel>Sending Email</guilabel> step lets you configure sending 
 	email.
@@ -143,7 +230,7 @@
 	  <listitem>
 	    <para>
 	      Server Type &mdash; There are numerous server types that
-	      <application>Evolution</application> supports for sending your
+	      <application>Ximian Evolution</application> supports for sending your
 	      mail.
 	      <itemizedlist>
 		<listitem>
@@ -178,7 +265,7 @@
 	      Authentication Type &mdash; Chances are you are using
 	      <guilabel>Password</guilabel>.  If you're not sure, ask
 	      your system administrator or ISP, or have
-	      <application>Evolution</application> check for you by
+	      <application>Ximian Evolution</application> check for you by
 	      clicking <guibutton>Check for supported
 	      types</guibutton>.
 	    </para>
@@ -202,16 +289,15 @@
     </sect2>
 
   <sect2 id="fourth-step">
-      <title>Step 4 of 4</title>
+      <title>Importing Mail (Optional)</title>
       <para>
-	Chances are, <application>Evolution</application> isn't your first email
-	program.  You're probably switching from another program and will want
-	access to your email from your old program.  It's for exactly these 
-	situations that <application>Evolution</application> includes an import 
-	feature.
+	If <application>Ximian Evolution</application> finds mail or address
+	files from another application, it will offer to import them.
+	If you're not sure which file format your mail program uses,
+	ask your system administrator.
       </para>
       <para>
-	<application>Evolution</application> can import the following types of
+	<application>Ximian Evolution</application> can import the following types of
 	files:
           <variablelist>
            <varlistentry>
@@ -236,8 +322,8 @@
 	    <term>MBox (mbox)</term>
 	    <listitem>
 	      <para>
-	       The email box format used by Netscape, Evolution,
-	       Eudora, and many other email clients.
+	       The email box format used by Mozilla, Netscape,
+	       Ximian Evolution, Eudora, and many other email clients.
   	     </para>
 	    </listitem>
 	  </varlistentry>
@@ -245,25 +331,56 @@
 </para>
 <para>
     <note>
-      <title>Outlook 2000</title>
+      <title>Outlook 2000 Users</title>
       <para>
 	Outlook 2000 uses a proprietary format that
-	<application>Evolution</application> cannot import directly.
-	To import files from Outlook 2000, you will need to boot to
-	Windows, import the files into Mozilla mail, then reboot and
-	import from Mozilla.  Please see the <xref linkend="evolution-faq">FAQ for more
-	information.
+	<application>Ximian Evolution</application> cannot import directly.
+	To import files from Outlook 2000, do the following:
+	<orderedlist numeration="arabic">
+
+	<listitem>
+	<para>
+	  While using Windows, import the files into Mozilla Mail (or
+	  another mailer, such as Netscape or Eudora, that uses the
+	  standard mbox format).
+        </para>
+        </listitem>
+	
+	<listitem>
+	<para>
+          Copy the files to the system or partition you use for
+          <application>Ximian Evolution</application>.  
+         </para>
+        </listitem>
+
+	<listitem>
+	<para>
+	  Use the <application>Ximian Evolution</application> import
+          tool to import the files.  Read the FAQ at the Ximian
+          website for more information.
       </para>
+        </listitem>
+     </orderedlist>
+    </para>
     </note>     
 
+    <note>
+      <title>Netscape Users</title>
+      <para>
+	Before importing mail from Netscape, make sure you select
+	<menuchoice><guimenu>File</guimenu><guimenuitem>Compact All
+	Folders</guimenuitem></menuchoice>. If you don't,
+	<application>Ximian Evolution</application> will import and undelete
+	the messages in your Trash folders.
+      </para>
+    </note>     
 
-      Ask your system administrator if you aren't sure which you use.
     </para>
 
       <tip>
-	<title>Exporting Files From Evolution</title>
+	<title>Exporting Files From Ximian Evolution</title>
 	<para>
-          Evolution uses standard file types for all its information,
+          Ximian Evolution uses standard file types for all its information,
           so you should have no trouble taking your information
           elsewhere if you want.
         </para>
@@ -277,35 +394,36 @@
   </sect1>
 
   <sect1 id="ui-intro">
-    <title>What's What in Evolution</title>
+    <title>What's What in Ximian Evolution</title>
     <para>
         Now that you've gotten the first-run configuration out of the
         way, you're ready to get down to work.  Here's a quick
         explanation of what's going on in your main
-        <application>Evolution</application> window.
+        <application>Ximian Evolution</application> window.
     </para>
 
     <figure id="preface-basic-interface">
-      <title>The Evolution Main Window</title>
+      <title>The Ximian Evolution Main Window</title>
       <screenshot>
 	<screeninfo>Inbox</screeninfo>
-	<graphic srccredit="Kevin Breit" fileref="figures/mainwindow-pic"/>
-	</graphic>
+	<mediaobject><imageobject><imagedata
+	fileref="figures/mainwindow-pic" format="png" srccredit="Kevin
+	Breit"> </imageobject></mediaobject>
       </screenshot>
     </figure>
     
     <para>
-      <inlinegraphic fileref="figures/full-1" format="png"></inlinegraphic>
+      <inlinemediaobject><imageobject><imagedata  fileref="figures/full-1" format="png"></imageobject></inlinemediaobject>
       <guilabel>Menubar</guilabel>
     </para>
     
     <para>
       The <guilabel>Menubar</guilabel> gives you access to nearly all the
-      features that can be found in <application>Evolution</application>.
+      features that can be found in <application>Ximian Evolution</application>.
     </para>
 
     <para>
-      <inlinegraphic fileref="figures/full-2" format="png"></inlinegraphic>
+      <inlinemediaobject><imageobject><imagedata  fileref="figures/full-2" format="png"></imageobject></inlinemediaobject>
       <guilabel>Toolbar</guilabel>
     </para>
 
@@ -315,7 +433,7 @@
     </para>
     
     <para>
-      <inlinegraphic fileref="figures/full-3" format="png"></inlinegraphic>
+      <inlinemediaobject><imageobject><imagedata  fileref="figures/full-3" format="png"></imageobject></inlinemediaobject>
       <guilabel>Shortcut Bar</guilabel>
     </para>
     
@@ -325,24 +443,24 @@
     </para>
     
     <para>
-      <inlinegraphic fileref="figures/full-4" format="png"></inlinegraphic>
+      <inlinemediaobject><imageobject><imagedata  fileref="figures/full-4" format="png"></imageobject></inlinemediaobject>
       <guilabel>Status Bar</guilabel>
     </para>
     
     <para>
-      Periodically, <application>Evolution</application> will need to quietly
+      Periodically, <application>Ximian Evolution</application> will need to quietly
       display a message, or tell you the progress of a task.  This most
       often happens when you're checking or sending email.  These progress
       queues are shown here, in the <guilabel>Status Bar</guilabel>.  
     </para>
     
     <para>
-      <inlinegraphic fileref="figures/full-5" format="png"></inlinegraphic>
-      <guilabel>Search Bar</guilabel>
+      <inlinemediaobject><imageobject><imagedata  fileref="figures/full-5" format="png"></imageobject></inlinemediaobject>
+      <guilabel>Search Tools</guilabel>
     </para>
     
     <para>
-      The <guilabel>Search Bar</guilabel> lets you search through your email
+      The <guilabel>Search Tool</guilabel> lets you search through your email
       with precision so you can easily find what you're looking for.
     </para>
 
@@ -350,7 +468,7 @@
   <sect2 id="usage-mainwindow-shortcutbar">
     <title>The Shortcut Bar</title>
     <para>
-        <application>Evolution</application>'s most important job is
+        <application>Ximian Evolution</application>'s most important job is
         to give you access to your information and help you use it
         quickly.  One way it does that is through the
         <interface>shortcut bar</interface>, the column on the left
@@ -366,14 +484,15 @@
 
 	    <variablelist>
 	      <varlistentry>
-		<term> <guibutton>My Evolution</guibutton></term>
+		<term> <guibutton>Summary</guibutton></term>
 		<listitem>
 	    <para>
-		    Start your day here.  <guilabel>My Evolution</guilabel>
-		    gives you a quick summary of new or important messages,
-		    daily appointments and urgent tasks.  You can customize
+		    Start your day here.  The Ximian Evolution
+		    <guilabel>Summary</guilabel> gives you a quick
+		    summary of new or important messages, daily
+		    appointments and urgent tasks.  You can customize
 		    its appearance and content, and use it to access
-		    Evolution services.
+		    Ximian Evolution services.
 		  </para>
 		</listitem>
 	      </varlistentry>
@@ -384,7 +503,7 @@
 	    <para>
 	      Click the <guibutton>Inbox</guibutton> button to start
 	      reading your mail.  Your Inbox is also where you can
-	      access Evolution's tools to filter, sort, organize, and
+	      access Ximian Evolution's tools to filter, sort, organize, and
 	      search your mail.
 	    </para>
 	  </listitem>
@@ -394,7 +513,7 @@
 	  <term><guibutton>Calendar</guibutton></term>
 	  <listitem>
 	    <para>
-	      The Calendar can store your appointments and To do lists
+	      The Calendar can store your appointments and task lists
 	      for you.  Connected to a network, you can use it to keep
 	      a group of people on schedule and up to date.
 	    </para>
@@ -447,21 +566,22 @@
     <para>
       The <interface>folder bar</interface> is a more comprehensive
       way to view the information you've stored with
-      <application>Evolution</application>. It displays all your
+      <application>Ximian Evolution</application>. It displays all your
       appointments, address cards, and email in a tree that's a lot
       like a <glossterm linkend="filetree">file
       tree</glossterm>&mdash; it starts small at the top, and branches
       downwards. On most computers, there will be three or four
-      folders at the base.  First is the <guilabel>Local</guilabel>
-      folder, which holds all the <application>Evolution</application>
-      data that's stored on your computer.  After that are
-      <guilabel>Other Contacts</guilabel>, <glossterm
-      linkend="ldap">LDAP</glossterm> contact directories stored on a
-      network, followed by any <glossterm
-      linkend="imap">IMAP</glossterm> mail folders you may have
-      available to you over your network.  Lastly, there are
-      <guilabel>Virtual Folders</guilabel>, discussed in <xref
-      linkend="usage-mail-organize-vfolders">,
+      folders at the base.  First, of course, is the
+      <guilabel>Summary</guilabel>, a customizable summary of your
+      information. Below that are your <guilabel>Local
+      Folders</guilabel>, which hold all the
+      <application>Ximian Evolution</application> data that's stored on your
+      computer.  After that are your network servers: <glossterm
+      linkend="ldap">LDAP</glossterm> servers that host shared contact
+      directories, and <glossterm linkend="imap">IMAP</glossterm> mail
+      folders to which you subscribe.  Lastly, there are
+      <guilabel>vFolders</guilabel>, or virtual folders, discussed in
+      <xref linkend="usage-mail-organize-vfolders">,
     </para>
     <para>
        
@@ -469,12 +589,6 @@
       <itemizedlist>
 	 <listitem>
 	    <para>
-	     <guilabel>My Evolution</guilabel>, a quick summary to help you do
-	     your tasks.
-           </para>
-	 </listitem>
-	 <listitem>
-	    <para>
 	     <guilabel>Calendar</guilabel>, for appointments and
 	     event listings.
 	   </para>
@@ -499,7 +613,7 @@
 	   <para>
 	    <guilabel>Outbox</guilabel>, for messages you have written
 	    but not yet sent.  This will be empty unless you use
-	    <application>Evolution</application> while offline.
+	    <application>Ximian Evolution</application> while offline.
 	   </para>
 	 </listitem>
 
@@ -511,18 +625,16 @@
 
 	<listitem>
 	    <para>
-	    <guilabel>Trash</guilabel>, a virtual folder view of all
-	    the messages you have marked for deletion but not yet
-	    <glossterm linkend="expunge">expunged</glossterm>. Note that 
-	    once you have expunged a message, it
-	    is permanently deleted.
+	    <guilabel>Trash</guilabel>, a vFolder view of all the
+	    messages you have marked for deletion but not yet
+	    <glossterm linkend="expunge">expunged</glossterm>.
 	   </para>
 	 </listitem>
       </itemizedlist>
 
     </para>
     <tip id="foldertips">
-    <title>Navigating without the Folder Bar</title>
+    <title>Navigating without the Folder Bar or the Shortcut Bar</title>
        <para>
          You don't need the folder bar or the shortcut bar to move
          around the main window. You can use <keycap>Tab</keycap> to
@@ -535,9 +647,8 @@
      </tip>
 
     <para>
-       If you get any serious amount of mail, you'll want more folders
-       than just your Inbox.  
-	To create a new folder:
+       If you get large volumes of mail, you'll want more folders than
+       just your Inbox.  To create a new folder:
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
@@ -561,7 +672,6 @@
 	  <listitem>
 	    <para>
 	      Select the folder type.  The available options are.
-
 	      <itemizedlist>
 		<listitem>
 		  <para>
@@ -580,31 +690,16 @@
 		</listitem>
 		<listitem>
 		  <para>
-		    Mail Storage
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    My Evolution
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
 		    Tasks
 		  </para>
 		</listitem>
-		<listitem>
-		  <para>
-		    vTrash
-		  </para>
-		</listitem>
 	      </itemizedlist>
 
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Select the folder for the new folder to go in.
+	      Choose the location of the new folder.
 	    </para>
 	  </listitem>
 	</orderedlist>
@@ -613,14 +708,11 @@
     <sect3 id="subfolders">
     <title>Subfolders</title>
       <para>
-        <application>Evolution</application> can also manage subfolders,
-	subfolders are folders inside of folders.  This works well if
-	you want to try to separate your home folders from your work
-	folders, or if you like to keep very organized.
+        <application>Ximian Evolution</application> lets you nest folders
+	inside of each other, so that you can have a detailed
+	organizational system.
       </para>
 
-    
-
        <note>
 	  <title>Folders Have Limits</title>
 	  <para>
@@ -630,13 +722,12 @@
 	</note>
 
     <para>
-      Right-clicking will bring up a menu for just about anything
-      in GNOME, and <application>Evolution</application> is no
-      exception.  If you right-click on a folder, you'll have a
-      menu with the following options:
+      Right-clicking will bring up a menu for just about anything in
+      <application>Ximian Evolution</application>.  If you right-click on a
+      folder, you'll have a menu with the following options:
       <itemizedlist>
 	<listitem><para><guimenuitem>View</guimenuitem>, to view the folder. </para></listitem>
-	<listitem><para><guimenuitem>Open in New Window</guimenuitem>, to see it in a new Evolution window. </para></listitem>
+	<listitem><para><guimenuitem>Open in New Window</guimenuitem> to view the folder in another window. </para></listitem>
 	<listitem><para><guimenuitem>Move</guimenuitem>, to move the folder to another location. </para></listitem>
 	<listitem><para><guimenuitem>Copy</guimenuitem>, to duplicate the folder. </para></listitem>
 	<listitem><para><guimenuitem>Delete</guimenuitem>, to delete the folder and all its contents. </para></listitem>
@@ -644,34 +735,17 @@
 	<listitem><para><guimenuitem>Create New Folder</guimenuitem>, to create another folder in the same location. </para></listitem>
 	<listitem><para><guimenuitem>Add to Shortcut Bar</guimenuitem>, to add the folder to your shortcut bar. </para></listitem>
 	<listitem><para><guimenuitem>Properties</guimenuitem>, to view or change the folder properties. </para></listitem>
-
       </itemizedlist>
     </para>
-
     <para>
       You can also rearrange folders and messages by dragging and
       dropping them.
     </para>
 
-    
-
-<!--
-    <tip>
-     <title>Context-Sensitive Help</title>
-      <para>
-	GNOME 2.0 offers context-sensitive help, which means you can
-	almost always get help on an item by right-clicking it.  If
-	you're not sure what something is, or don't know what you can
-	do with it, choosing <guimenuitem>Help</guimenuitem> from the
-	right-click menu is a good way to find out.
-      </para>
-    </tip>
--->
-
 	<para>
-	  Any time new information arrives in a mail folder, that folder label
-	  is displayed in bold text, along with the number of new messages in
-	  that folder inside of paranthesis.
+	  Any time new mail arrives in a mail folder, that folder
+	  label is displayed in bold text, along with the number of
+	  new messages in that folder.
 	</para>
       </sect3>
     </sect2>
@@ -681,26 +755,21 @@
     <para>
       The <interface>menu bar</interface>'s contents will always
       provide all the possible actions for any given view of your
-      data.  That means that, depending on the context, menu bar items
-      will change.  If you're looking at your Inbox, most of the menu
-      items will relate to mail; some will relate to other components
-      of <application>Evolution</application> and some, especially
-      those in the <guimenu>File Menu</guimenu> will relate to the
-      application as a whole. The contents of the menu bar are
-      described in <xref linkend="menuref">.
-   </para>
+      data.  If you're looking at your Inbox, most of the menu items
+      will relate to mail; some will relate to other components of
+      <application>Ximian Evolution</application> and some, especially those
+      in the <guimenu>File Menu</guimenu> will relate to the
+      application as a whole. 
+   </para> 
    <para>
       <variablelist>
         <varlistentry>
           <term> <guimenu>File</guimenu></term>
 
-          <listitem><para> 
-            Anything even related to a file or to the operations
-            of the application generally  falls under this
-            menu: creating things, saving them to disk, 
-            printing them, and quitting the program itself.  
-
-            </para></listitem>
+          <listitem><para> Anything related to a file or to the
+            operations of the application generally falls under this
+            menu: creating things, saving them to disk, printing them,
+            and quitting the program itself.  </para></listitem>
         </varlistentry>
 
        <varlistentry>
@@ -714,9 +783,9 @@
        <varlistentry>
           <term> <guimenu>View</guimenu></term>
           <listitem><para>
-            This menu lets you decide how <application>Evolution</application> 
+            This menu lets you decide how <application>Ximian Evolution</application> 
             should look. Some of the features control the appearance of 
-            <application>Evolution</application> as a whole, and others 
+            <application>Ximian Evolution</application> as a whole, and others 
             the way a particular kind of information appears.
           </para></listitem>
         </varlistentry>
@@ -731,7 +800,6 @@
           </para></listitem>
         </varlistentry>
 
-
        <varlistentry>
           <term> <guimenu>Tools</guimenu></term>
           <listitem><para>
@@ -750,7 +818,7 @@
           <listitem><para>
              Select among these items to open the 
              <application>Help Browser</application> 
-             and read the <application>Evolution</application> manual.
+             and read the <application>Ximian Evolution</application> manual.
           </para></listitem>
         </varlistentry>
       </variablelist>
@@ -759,11 +827,280 @@
    <para>
       Once you've familiarized yourself with the <interface>main
       window</interface> you can start doing things with it.  We'll
-      start with <guilabel>My Evolution</guilabel>, the summary of
-      everything that's going on.
+      start with the <guilabel>Summary</guilabel>, which provides a
+      quick overview of your <application>Ximian
+      Evolution</application> information.
     </para>
     </sect2>
-  </sect1>
- 
-</chapter>
+    <sect2 id="basics-summary">
+      <title>Introducing the Summary</title>
+      <para>
+         The Ximian Evolution Summary provides you with a quick
+         run-down of important information: your appointments for a
+         given day, how much new mail you have, headlines from
+         selected news services, and so forth. To see the Summary,
+         click on the <guibutton>Summary</guibutton> button in the
+         shortcut bar, or select the <guilabel>Summary</guilabel>
+         folder in the folder bar.
+      </para>
 
+      <para>
+        FIXME: Insert picture of the Summary and labels here.
+      </para>
+
+      <para>
+        To add additional services to your Summary, or to edit the
+        existing services, select
+        <menuchoice>
+	  <guimenu>Tools</guimenu> 
+	  <guimenuitem>Summary Settings</guimenuitem> 
+	</menuchoice>.
+      </para>
+
+    </sect2>
+
+    <sect2 id="basics-mail">
+      <title>Introducing Email</title>
+      <para>
+         <application>Ximian Evolution</application> email is like other
+         email programs in several ways:
+     <itemizedlist>
+	  <listitem>
+	    <para>
+              It can sort and organize your mail in a wide variety of
+              ways with folders, searches, and filters.
+           </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+              It can send and receive mail in HTML or as plain text,
+              and makes it easy to send and recieve multiple file
+              attachments.
+           </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+              It supports multiple mail sources, including <glossterm
+              linkend="imap">IMAP</glossterm>, <glossterm
+              linkend="pop">POP3</glossterm>, local
+              <filename>mbox</filename> and
+              <filename>mh</filename> files.
+
+<!-- NOT FOR 1.0, but maybe later 
+              and even NNTP messages (newsgroups), which aren't
+              technically email.
+-->
+            </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      It lets you guard your privacy with encryption.
+	    </para>
+	  </listitem>
+	</itemizedlist>
+      </para>
+      <para>
+        However, <application>Ximian Evolution</application> has some
+        important differences.  First, it's built to handle very large
+        amounts of mail.  Both the <link
+        linkend="usage-mail-organize-filters">filtering</link> and
+        <link linkend="usage-mail-organize-search">searching</link>
+        functions were built for speed and efficiency on large volumes
+        of mail. There's also the <application>Ximian Evolution</application>
+        <link linkend="usage-mail-organize-vFolders">vFolder</link>,
+        an advanced organizational feature not found in mainstream
+        mail clients.  If you get a lot of mail, or if you keep every
+        message you get in case you need to refer to it later, you'll
+        find this feature especially useful.
+     </para>
+     <para>
+        Here's what the mailer looks like:
+
+ <!-- ==============Figure=================================== -->
+
+      <figure id="usage-mail-intro-fig">
+          <title>Ximian Evolution Mail</title>
+          <screenshot>
+            <screeninfo>Inbox</screeninfo>
+            <mediaobject><imageobject><imagedata  fileref="figures/mail-inbox" format="png" srccredit="Kevin Breit">
+        </imageobject></mediaobject>
+        </screenshot>
+      </figure>
+<!-- ==============End of Figure============================== -->
+</para>
+      <para>
+        <inlinemediaobject><imageobject><imagedata  fileref="figures/full-1"
+        format="png"></imageobject></inlinemediaobject> <guilabel>Email
+        Viewer</guilabel>
+      </para>
+    
+      <para>
+        This is where your email is displayed.
+      </para>
+
+      <para>
+        <inlinemediaobject><imageobject><imagedata  fileref="figures/full-2"
+        format="png"></imageobject></inlinemediaobject> <guilabel>Email List</guilabel>
+      </para>
+    
+      <para>
+        The <guilabel>Email List</guilabel> displays all the emails
+        that you have.  This includes all your read, unread, and email
+        that is flagged to be deleted.
+      </para>
+
+      <para>
+     If you find the <interface>view pane</interface> too small, you can resize
+        the pane, enlarge the whole window, or double-click on the
+        message in the <interface>message list</interface> to have it
+        open in a new window.  To change the sizes of a pane, just click
+        and hold on the divider between the two panes.  Then you can drag
+        up and down to select the size of the panes.  Just like with
+        folders, you can right-click on messages in the message list and
+        get a menu of possible actions.
+      </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.
+        The most frequently used ones, like
+        <guimenuitem>Reply</guimenuitem> and
+        <guimenuitem>Forward</guimenuitem>, also appear as buttons in
+        the toolbar. Almost all of them are also located in the
+        right-click menu and as keyboard shortcuts, which tend to be
+        faster once you get the hang of them.  You can choose
+        whichever way you like best; the idea is that the software
+        should work the way you want, rather than making you work the
+        way the it does.
+      </para>
+
+       <para>
+         For an in-depth guide to the email capabilities of Ximian
+         Evolution, read <xref linkend="usage-mail">.
+      </para>
+    </sect2>
+    <sect2 id="basics-calendar">
+      <title>Introducing the Calendar</title>
+      <para>
+       To begin using the calendar, select
+       <guibutton>Calendar</guibutton> from the <interface>shortcut
+       bar</interface>.  By default, the calendar starts showing
+       today's schedule on a ruled background.  At the upper right,
+       there's a monthly calendar you can use to switch days.  Below
+       that, there's a <guilabel>Task</guilabel> pad, where you can
+       keep a list of tasks separate from your calendar appointments.
+       The day view in the calendar looks like this:
+
+   <!-- ============== Figure ============================= -->
+    <figure id="usage-calendar-fig">
+      <title>Ximian Evolution Calendar View</title>
+      <screenshot>
+	<screeninfo>Ximian Evolution Contact Manager Window</screeninfo>
+	<mediaobject><imageobject><imagedata  fileref="figures/calendar" format="png" srccredit="Aaron Weber">
+	</imageobject></mediaobject>
+      </screenshot>
+    </figure>
+  <!-- ============== End of Figure ============================= --> 
+
+    </para>
+
+      <para>
+        <inlinemediaobject><imageobject><imagedata  fileref="figures/full-1"
+        format="png"></imageobject></inlinemediaobject> <guilabel>Appointment
+        List</guilabel>
+      </para>
+  
+      <para>
+	The <guilabel>Appointment List</guilabel> is responsible for showing you all of
+	your scheduled appointments, whether they are all day appointments or simply one time
+	appointments that last a half an hour.
+      </para>
+
+      <para>
+	<inlinemediaobject><imageobject><imagedata  fileref="figures/full-2" format="png"></imageobject></inlinemediaobject>
+	<guilabel>Task List</guilabel>
+      </para>
+
+      <para>
+        The <guilabel>Task List</guilabel> compliments the
+        <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.
+      </para>
+
+      <para>
+	<inlinemediaobject><imageobject><imagedata  fileref="figures/full-3" format="png"></imageobject></inlinemediaobject>
+	<guilabel>Calendar Window</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>.
+      </para>
+
+      <para>
+          For more information about the calendar
+          read <xref linkend="usage-calendar">.
+      </para>
+
+    </sect2>
+    <sect2 id="basics-contacts">
+      <title>Introducing the Address Book</title>
+      <para>
+        The <application>Ximian Evolution</application> address book can
+        handle all of the functions of an address book, phone book, or
+        Rolodex.  Of course, it's a lot easier to update
+        <application>Ximian Evolution</application> than it is to change an
+        actual paper book. <application>Ximian Evolution</application> also
+        allows easy synchronization with hand-held devices.  Since
+        <application>Ximian Evolution</application> supports the <glossterm
+        linkend="ldap">LDAP</glossterm> directory protocol, you can
+        use it with almost any type of existing directory server on
+        your network.
+      </para>
+      <para>
+        Another advantage of the <application>Ximian Evolution</application>
+        address book is its integration with the rest of the
+        application.  For example, you can create an address card from
+        an email just by right-clicking on the sender's email address.
+      </para>
+      <para>
+        To open your address book, click on
+        <guibutton>Contacts</guibutton> in the shortcut bar, or select
+        one of your contacts folders from the folder bar.  <xref
+        linkend="usage-contact-fig"> shows the address book in all its
+        organizational glory.  By default, the address book shows all
+        your cards in alphabetical order, in a <glossterm
+        linkend="minicard">minicard</glossterm> view.  You can select
+        other views from the <guimenu>View</guimenu> menu, and adjust
+        the width of the columns by clicking and dragging the grey
+        column dividers.
+      </para>
+      <para>
+        The address book looks like this:
+
+      <figure id="usage-contact-fig">
+	<title>Ximian Evolution Contact Interface</title>
+	<screenshot>
+	  <screeninfo>Ximian Evolution Contact List Window</screeninfo>
+	  <mediaobject><imageobject><imagedata  fileref="figures/contact" format="png" srccredit="Kevin Breit">
+  	  </imageobject></mediaobject>
+	</screenshot>
+      </figure>
+     </para>
+      <para>
+        <inlinemediaobject><imageobject><imagedata  fileref="figures/full-1"
+        format="png"></imageobject></inlinemediaobject> <guilabel>Contact
+        List</guilabel>
+      </para>
+      <para>
+        The <guilabel>Contact List</guilabel> lists your contacts.
+      </para>
+      <para>
+          For detailed instructions on how to use the address book,
+          read <xref linkend="usage-contact">.
+      </para>
+    </sect2>
+  </sect1>
+</chapter>
\ No newline at end of file