Update

svn path=/trunk/; revision=13711

14 files changed, 2904 insertions, 2895 deletions

diff --git a/help/no/apx-gloss.sgml b/help/no/apx-gloss.sgml
index 76102417c4..84f6b3cfb4 100644
--- a/help/no/apx-gloss.sgml
+++ b/help/no/apx-gloss.sgml
@@ -69,17 +69,6 @@
   </glossdef>
  </glossentry>
 
-<glossentry id="emoticon">
-  <glossterm>Emoticon</glossterm>
-  <glossdef>
-   <para>
-     Also called "smileys," emoticons are the little sideways faces made
-     of colons and parentheses which people use to convey emotion in email.
-     Examples: :-) or ;(  .
-   </para>
-  </glossdef>
- </glossentry>
-
  <glossentry id="evolution">
   <glossterm>Evolution</glossterm>
   <glossdef>
@@ -123,11 +112,11 @@
      A way of describing a group of files on a computer.  With the
      perversity typical of computer (and especially Unix and Linux)
      nomenclature, the top of the tree is called the root directory,
-     and denoted by <systemitem><filename>/</filename></systemitem>.
+     and denoted by <filename>/</filename>.
      The rest of the "branches" spread downwards from the root.  Don't
-     confuse the root directory with the <systemitem>root</systemitem>
+     confuse the root directory with the root
      account, or root's home directory,
-     <systemitem><filename>/home/root</filename></systemitem>.
+     <filename>/home/root</filename>.b
    </para>
   </glossdef>
  </glossentry>
@@ -166,17 +155,6 @@
   </glossdef>
  </glossentry>
 
- <glossentry id="haiku">
-  <glossterm>Haiku</glossterm>
-  <glossdef>
-   <para>
-     A traditional Japanese form of poetry.  The poems are three lines
-     long, with first and last lines having five syllables, and the
-     second line seven syllables.
-   </para>
-  </glossdef>
- </glossentry>
-
  <glossentry id="html">
   <glossterm>HTML</glossterm>
   <glossdef>
@@ -281,15 +259,6 @@
   </glossdef>
  </glossentry>
 
- <glossentry id="nickname">
-  <glossterm>Nickname</glossterm>
-  <glossdef>
-   <para>
-    An alias for an e-mail address.
-   </para>
-  </glossdef>
- </glossentry>
-
  <glossentry id="pop">
   <glossterm>POP</glossterm>
   <glossdef>
@@ -309,12 +278,25 @@
      sending particular types of information between computer systems.
      Examples include POP (Post Office Protocol), for email, and HTTP
      (HypterText Transfer Protocol), for web pages.
+   </para>
+  </glossdef>
+ </glossentry>
 
+ <glossentry id="public-key-encryption">
+  <glossterm>Public Key Encryption</glossterm>
+  <glossdef>
+   <para>
+     A strong encryption method that uses a set of two "keys," one of
+     which is made public, and one of which is kept private. Data
+     encrypted using the public key can only be decrypted using the
+     private key.  The longer the keys, the more difficult it is to
+     break the encryption.
    </para>
   </glossdef>
  </glossentry>
 
 
+
  <glossentry id="regular-expression">
   <glossterm>Regular Expression</glossterm>
   <glossdef>
@@ -391,19 +373,6 @@
    </glossdef>
   </glossentry> 
 
- <glossentry id="spam">
-  <glossterm>Spam</glossterm>
-  <glossdef>
-   <para>
-    Useless, unsolicited e-mail.  Spam normally comes in forms of
-    chain letters and advertisements for unscrupulous or clueless
-    companies.  Messages that are merely useless are called "opt-in
-    newsletters."
-   </para>
-  </glossdef>
- </glossentry>
-
-
  <glossentry id="tooltip">
   <glossterm>Tool-Tip</glossterm>
   <glossdef>
@@ -415,17 +384,15 @@
   </glossdef>
  </glossentry>
 
-
-
-
  <glossentry id="virus">
   <glossterm>Virus</glossterm>
   <glossdef>
    <para>
-    A malicious program which inserts itself into others so that it will be 
-    executed, allowing it to spread to still more programs and other computers.
-    A virus can cause substantial damage by clogging networks or disk drives, 
-    deleting files, or opening security holes.
+    A program which inserts itself into other files or programs and
+    which, when executed, spreads to more programs and other
+    computers.  A virus can cause substantial damage by clogging
+    networks or disk drives, deleting files, or opening security
+    holes.
    </para>
   </glossdef>
  </glossentry>
diff --git a/help/no/config-prefs.sgml b/help/no/config-prefs.sgml
index b3e27fce98..128dc24437 100644
--- a/help/no/config-prefs.sgml
+++ b/help/no/config-prefs.sgml
@@ -35,7 +35,7 @@
 	    <term><guilabel>Display</guilabel></term>
 	    <listitem>
 	      <para>
-		Allows you to edit how email is handled and displayed.
+		Allows you to edit how email appears.
 	      </para>
 	    </listitem>
 	  </varlistentry>
@@ -43,7 +43,7 @@
 	    <term><guilabel>Composer</guilabel></term>
 	    <listitem>
 	      <para>
-		Customizes the composer's behavior.
+		Customizes the behavior of the email message composer.
 	      </para>
 	    </listitem>
 	  </varlistentry>
@@ -51,8 +51,9 @@
 	    <term><guilabel>Other</guilabel></term>
 	    <listitem>
 	      <para>
-		Configures miscellanious aspects of <application>Evolution</application>
-		such as character sets.
+		Configures miscellanious aspects of
+		<application>Evolution</application> such as character
+		set and encryption tools.
 	      </para>
 	    </listitem>
 	  </varlistentry>
@@ -65,236 +66,332 @@
 	<title>Mail Preferences Dialog</title>
 	<screenshot>
 	  <screeninfo>Setting mail preferences</screeninfo>
-	  <graphic fileref="figures/config-mail" format="png" srccredit="Aaron Weber">
-	    </graphic>
+	  <mediaobject><imageobject><imagedata fileref="figures/config-mail" format="png" srccredit="Aaron Weber">
+	    </imageobject></mediaobject>
 	</screenshot>
       </figure>
       <!-- ==============End of Figure================-->
 
 
-      <sect2 id="config-prefs-mail-identity">
-      <title>Identity Settings</title> 
+    <sect2 id="config-prefs-mail-identity">
+      <title>Working with the Accounts Tab</title> 
       <para>
-         If you have only one email account, or send email from only
-         one address, you will only need to configure one identity. If
-         you want, however, you can have multiple identities.  This
-         can be useful if you want to keep personal and professional
-         email separate, or if you wear several hats at work.
-         
+         <application>Ximian Evolution</application> allows you to
+         maintain multiple accounts, or identities.  This is useful
+         want to keep personal and professional email separate, or if
+         you wear several hats at work. When you are writing an email
+         message, you can which account to use by selecting from the
+         drop-down list next to the <guilabel>From</guilabel> entry in
+         the message composer.
        </para>
+
        <para>
-         To add a new identity, simply click
-         <guibutton>Add</guibutton>. To alter an existing identity,
-         click on it in the <guilabel>Identity</guilabel> tab of the
+         Clicking <guibutton>Get Mail</guibutton> will refresh any
+         IMAP, <filename>mh</filename>, or
+         <filename>mbox</filename> listings
+         and check and download mail from all POP servers.  In other
+         words, <guibutton>Get Mail</guibutton> gets your mail, no
+         matter how many sources you have, or what types they are.  If
+         you don't want to check mail for a given account, select it
+         in the <guilabel>Accounts</guilabel> tab and click the
+         <guibutton>Disable</guibutton> button.
+       </para>
+       
+      <para>
+         To add a new account, simply click <guibutton>Add</guibutton>
+         to open the mail configuration assistant. To alter an
+         existing identity, select it in the
          <interface>Preferences</interface> window, and then click
-         <guibutton>Edit</guibutton>.
+         <guibutton>Edit</guibutton> to open the account editor
+         dialog.
       </para>
+     <para>
+         The account editor dialog has six sections:
+          <variablelist>
 
-      <para>
-         <application>Evolution</application> will then present you
-         with a dialog box containing four fields:
-          <itemizedlist>
+	  <varlistentry> 
+	    <term>Identity:</term>
            <listitem>
 	    <para>
-              <guilabel>Full Name:</guilabel> by default, this is the
-              same name as the full name described in your user
-              account on your computer.  You can select another if you
-              wish.
+              Here, enter the name,
+              email address, and other identifying information for the
+              account.
             </para>
 	  </listitem>
+	  </varlistentry>
+	  <varlistentry> 
+	    <term>Receiving Mail</term>
            <listitem>
 	    <para>
-              <guilabel>Email address:</guilabel> Enter your email
-              address in this space.
+             Here, select the way you will be getting mail: you may
+             download mail from a server (<glossterm
+             linkend="pop">POP</glossterm> or <glossterm
+             linkend="imap">IMAP</glossterm>) or access it from files
+             on your local system.  If you use a server, it may permit
+             or require you to use a Secure Socket Layer (SSL)
+             connection.  To turn SSL connections on, just click the
+             <guibutton>Use Secure Connection (SSL)</guibutton>
+             button.
+
+<note id="config-arbitrary-port">
+<title>Specifying Port Numbers</title>
+<para>
+Your system administrator may ask you to connect to a specific port on
+a mail server. To specify which port you use, just type a colon and
+the port number after the server name. For example, to connect to port
+143 on the server smtp.omniport.com, you would enter
+as
+<userinput>
+smtp.omniport.com:143
+</userinput> as the server name.
+</para>
+</note>
+
+	  </para>
+	  </listitem>
+	  </varlistentry>
+	  <varlistentry> 
+	    <term>Receiving Options</term>
+           <listitem>
+	    <para>
+              Here, decide whether you'd like to check for mail
+              automatically, and set other options related to the
+              behavior of your server.  If you use POP mail, you can
+              decide whether to leave mail on the server, and if you
+              use IMAP, you can set folder subscription options here.
             </para>
 	  </listitem>
+	  </varlistentry>
+	  <varlistentry> 
+	    <term>Sending Mail</term>
            <listitem>
 	    <para>
-              <guilabel>Organization:</guilabel> If you send email as
-              a representative of a company or other organization,
-              enter its name here.
+              In this section, you will choose and configure a method
+              for sending mail.  You may choose <glossterm
+              linkend="smtp">SMTP</glossterm> or <glossterm
+              linkend="sendmail">sendmail</glossterm>.
+             </para>
+	  </listitem>
+	  </varlistentry>
+	  <varlistentry> 
+	    <term>Special Folders</term>
+           <listitem>
+	    <para>
+              Here, you can decide where this account will store the
+              messages that it has sent, and the messages that you
+              save as drafts.
             </para>
 	  </listitem>
+	  </varlistentry>
+	  <varlistentry> 
+	    <term>Security</term>
            <listitem>
 	    <para>
-              <guilabel>Signature file:</guilabel> You may choose a
-              small text file to be appended to every message that you
-              send.  Typically, signature files include address or
-              other contact information, or a favorite quotation.
-              It's good form to keep it to four lines at the maximum.
+              In this section, you will set the security options for
+              this account. Enter your PGP Key ID and decide how
+              frequently to encrypt and sign your messages.
             </para>
 	  </listitem>
-	</itemizedlist>
+	  </varlistentry>
+	</variablelist>
       </para>
     </sect2>
 
-    <sect2 id="config-prefs-mail-network">
-      <title>Network Settings</title> 
+    <sect2 id="config-prefs-mail-display">
+      <title>Mail Display Options</title>
       <para>
-        In order to send mail with
-        <application>Evolution</application>, you need to connect to
-        your network.  To do that, you'll need to know your user name
-        and password, what sort of mail sending and receiving
-        protocols your network uses, and the names of the servers
-        you'll be using.  If you're switching from another groupware
-        or email program, you can almost certainly use the same
-        settings as you did with that program. Network-related
-        settings are in the <guilabel>Mail Sources</guilabel> and
-        <guilabel>Mail Transport</guilabel> tabs.
+        In this tab you can decide how you would like
+        <application>Ximian Evolution</application> to display your
+        mail: how to display citations, how long to wait before
+        marking a message as read, and so forth.
       </para>
- 
-      <sect3 id="config-prefs-network-sources">
-	<title>Mail Sources</title>
-	<para>
-          The <interface>Mail Sources</interface> tab allows you to
-          add, edit, or delete methods of retrieving mail from
-          servers.  Clicking on <guibutton>Add</guibutton> or
-          <guibutton>Edit</guibutton> will bring up a dialog box to
-          offer you the following options:
-           <variablelist>
-	    <varlistentry>
-	      <term><guilabel>Mail source type:</guilabel></term>
-	      <listitem>
-		<para>
-                  Select from <glossterm
-                  linkend="imap">IMAP</glossterm> or <glossterm
-                  linkend="pop">POP</glossterm> servers, or Unix-style
-                  <systemitem><filename>mbox</filename></systemitem>
-                  or <systemitem><filename>mh</filename></systemitem>
-                  files.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term> <guilabel>Server:</guilabel></term>
-	      <listitem>
-		<para>
-                  Enter the name of the mail source server in this
-                  field. Your POP server may or may not be the same as your
-                  <glossterm linkend="smtp">SMTP</glossterm> server.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term><guilabel>Username:</guilabel></term>
-	      <listitem>
-		<para>
-                  Enter the user name for the account you have on the
-                  server - this should the part of your email address
-                  before the @.  If you use
-                  <systemitem><filename>mbox</filename></systemitem>
-                  or <systemitem><filename>mh</filename></systemitem>
-                  files as your mail source, you do not need to enter
-                  a username.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term><guilabel>Authentication:</guilabel></term>
-	      <listitem>
-		<para>
-                  Tell <application>Evolution</application> how to
-                  verify your identity with the server.  Your options
-                  vary depending upon the type of server you are
-                  using, and the ways it is configured.  Given the
-                  name of a server,
-                  <application>Evolution</application> can detect what
-                  sorts of authentication it offers.
-               </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term><guilabel>Test Settings</guilabel></term>
-	      <listitem>
-		<para>
-                  Click this button to have
-                  <application>Evolution</application> check to see if
-                  mail sources are configured correctly.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-          </para>
-          <para>
-            If you have several mail sources, clicking <guibutton>Get
-            Mail</guibutton> will refresh any IMAP,
-            <systemitem><filename>mh</filename></systemitem>, or
-            <systemitem><filename>mbox</filename></systemitem>
-            listings and check and download mail from all POP servers.
-            In other words, <guibutton>Get Mail</guibutton> gets your
-            mail, no matter how many sources you have, or what types
-            they are.  You can disable checking mail on accounts in their
-            properties.
-          </para>
-          <tip>
-            <title>Sharing Mailboxes with Other Mail Programs</title>
+     <para>
+        This is also where you can decide how you would like
+        <application>Ximian Evolution</application> to handle inline
+        images in HTML mail that you get. There is a detailed
+        discussion of the issues surrounding these options in <xref
+        linkend="usage-mail-getnsend-get-attach-html">.
+     </para>
+     <para>
+       To hange the font which <application>Ximian
+        Evolution</application> uses to display mail, do the
+        following:
+       <orderedlist numeration="arabic">
+	  <listitem>
             <para>
-              If you want to use <application>Evolution</application>
-              and another email client, such as
-              <application>Mutt</application>, at the same time,
-              here's how:
-              <orderedlist numeration="arabic">
-                <listitem>
-                   <para>
-                      Download your mail in the other application as
-                      you would normally.
-                   </para>
-                  </listitem>
-                <listitem>
-                   <para>
-                      In <application>Evolution</application>
-                      <menuchoice><guimenu>Tools</guimenu><guimenuitem>Mail
-                      Settings</guimenuitem></menuchoice>, and pick the account
-                      you'd like to use to share mail. You may want to
-                      create a new account just for this source of
-                      mail.
-                   </para>
-               </listitem>                     
-               <listitem>
-                   <para>
-                      Under the <guilabel>Receiving Mail</guilabel>
-                      tab, select the type of mail file that your
-                      other mail application uses, and then enter the
-                      full path to that file.
-                   </para>
-                  </listitem>
-                <listitem>
-                   <para>
-                      Click the <guibutton>OK</guibutton> button.
-                   </para>
-                  </listitem>
-                </orderedlist>
+              Open the Control Center by selecting <menuchoice>
+		<guimenu>System</guimenu>
+		<guimenuitem>Settings</guimenuitem> </menuchoice> from
+		the menu panel.
+            </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+               Select the HTML Viewer settings tool.
+            </para>
+	  </listitem>
+	  <listitem>
+	    <para>Choose the font and font size you would like to use.
+            </para>
+	  </listitem>
+	</orderedlist>
+
+       Alternately, open a terminal and run the
+       <command>gtkhtml-properties-capplet</command> command. This
+       will open the GNOME HTML Display Properties tool, and you can
+       select a font and other attributes of your HTML display,
+       including that in <application>Ximian Evolution</application>.
+     </para>
+     </sect2>
+
+    <sect2 id="config-prefs-mail-composer">
+      <title>Message Composer Preferences</title>
+      
+      <para>
+        Mercifully, there are only four preferences you can prefer in
+        the message composer preferences dialog:
+         <variablelist>
+	  <varlistentry>
+	    <term>Send mail in HTML format by default </term>
+	    <listitem>
+	      <para>
+                 If you would like all email messages that you compose
+                 to begin in HTML format, leave this box checked. You
+                 can convert messages between HTML and plain text by
+                 selecting the <menuchoice> <guimenu>Format</guimenu>
+                 <guimenuitem>HTML</guimenuitem> </menuchoice> toggle
+                 in the message composer.
+               </para>
+	    </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term>Default Forward style</term>
+	    <listitem>
+	      <para>
+                  Select from: 
+                  <simplelist>
+                   <member><guilabel>Attachment:</guilabel> the
+                  message you forward appended to the message you send
+                  as a seperate file.</member>
+
+                  <member> <guilabel>Inline:</guilabel> The message
+                  you forward is included at the end of the message
+                  you send.</member>
+
+		  <member> 
+                     <guilabel>Quoted:</guilabel> The message
+                     you forward is included at the end of the message
+                     you send, and a greater-than symbol (&gt;) is
+                     inserted at the beginning of each line to
+                     indicate that it is quoted.
+                   </member>
+		</simplelist>
+               </para>
+	    </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term>Prompt when sending messages with an empty subject</term>
+	    <listitem>
+	      <para>
+                 The composer will warn you if you try to send a
+                 message without a subject.
                </para>
-            </tip>
-        </sect3>
+	    </listitem>
+	  </varlistentry>
 
-      <sect3 id="config-prefs-mail-network-transports">
-	<title>Mail Transports</title>
+	  <varlistentry>
+	    <term>Prompt when sending messages with only Bcc recipients defined</term>
+	    <listitem>
+	      <para>
+                 The composer will warn you if you try to send a
+                 message that has only <guilabel>Bcc</guilabel>
+                 recipients. This is important because some mail
+                 servers will fail to honor blind carbon copy if you
+                 do not have at least one recipient that is visible to
+                 all readers.
+               </para>
+	    </listitem>
+	  </varlistentry>
+	</variablelist>
+      </para>
+    </sect2>
+     <sect2 id="config-prefs-mail-other">
+	<title>Other Mail Preferences</title>
 	<para>
-           The <interface>Mail Transports</interface> tab lets you choose
-           how you will send mail.  <application>Evolution</application> currently supports two
-           mail transport options: <glossterm linkend="smtp">SMTP</glossterm>, which
-           uses a remote mail server, and
-           <glossterm linkend="sendmail">sendmail</glossterm>, which uses the
-           <application>sendmail</application> program on your local
-           system.  <application>Sendmail</application> is more
-           difficult to configure, but offers more flexibility than
-           <glossterm>SMTP</glossterm>.
+          Not everything fits neatly into categories.  This tab
+          contains some miscellaneous configuration options that
+          didn't fit anywhere else.
+          <variablelist>
+
+	  <varlistentry>
+	    <term> 
+	      <guilabel>PGP binary path</guilabel>
+	    </term>
+	    <listitem>
+	      <para>
+                The complete path to your external encryption tool On
+                most Linux systems, this will be
+                <filename>/usr/bin/gpg</filename>.
+	      </para>
+	    </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term> 
+	      <guilabel>Remember PGP Passphrase until Exit</guilabel>
+	    </term>
+	    <listitem>
+	      <para> Check this box if you want <application>Ximian
+                Evolution</application> to remember your PGP
+                passphrase for as long as it is running.  You will
+                still have to enter your passphrase again each time
+                you start <application>Ximian Evolution</application>.
+	      </para>
+	    </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term>
+	      <guilabel>Default Character Encoding</guilabel>
+	    </term>
+	    <listitem> <para> Choose a default character encoding for
+	      your messages.
+	      </para>
+              </listitem>
+             </varlistentry>
+
+	  <varlistentry>
+	    <term>
+	      <guilabel>Empty Trash Folders on Exit</guilabel>
+	    </term>
+	    <listitem> <para> If you would like to expunge all deleted
+	      mail when you quit <application>Ximian
+	      Evolution</application>, check this box.
+	      </para>
+              </listitem>
+             </varlistentry>
+
+	  <varlistentry>
+	    <term>
+	      <guilabel>Log filter actions to:</guilabel>
+	    </term>
+	    <listitem> <para> If you like, you can have
+	      <application>Ximian Evolution</application> write all
+	      its message filter actions to a log file. Select a log
+	      file here.
+	      </para>
+              </listitem>
+             </varlistentry>
+           </variablelist>
         </para>
-	<para>
-            To use <guilabel>SMTP</guilabel>, you'll need to enter the
-            name of your SMTP server.  It may have the same name as
-            your mail source server.
-         </para>
-         <para>
-            <application>Evolution</application> can attempt to
-            determine if you have entered a valid server name.  To
-            have it do so, click the <guilabel>Test
-            Settings</guilabel> button.
-         </para>
-	</sect3>
       </sect2>
-      <sect2 id="config-prefs-network-news">          
+    </sect1>
+
+
+<!-- NOT FOR 1.0, see usage-mail.sgml
+      <sect1 id="config-prefs-news">          
           <title>News Servers</title>
           <para>
             Newsgroups are so much like mailing lists that there's no
@@ -314,62 +411,8 @@
             <interface>folder bar</interface>.
           </para>
      </sect2>
+-->
 
-     <sect2 id="config-prefs-mail-other">
-	<title>Other Mail Preferences</title>
-	<para>
-          Not everything fits neatly into categories.  This tab
-          contains some miscellaneous configurations that don't have
-          too much to do with each other.
-          <variablelist>
-
-             <varlistentry>
-	    <term> 
-	      <guilabel>Send messages in HTML format</guilabel>
-	    </term>
-	    <listitem><para>
-		If you check this box, you will send
-		messages as HTML by default.  If you leave it unchecked, your
-		messages will be sent without HTML formatting unless you select 
-		<menuchoice> <guimenu>Format</guimenu> <guimenuitem>HTML</guimenuitem>
-		</menuchoice> in the message composer.
-		See <xref linkend="usage-mail-getnsend-send-html">
-		  for more information about HTML mail.
-	      </para></listitem>
-	  </varlistentry>
-	  <varlistentry>
-                <term> 
-                   <guilabel>Mark Messages as Read After</guilabel>
-                </term>
-                <listitem><para> 
-                    When you click on a message,
-                    <application>Evolution</application> will wait a
-                    moment before marking it as read. You can set the
-                    delay, in milliseconds, here.
-                 </para></listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>
-                   <guilabel>Folder Format</guilabel>
-                </term>
-                <listitem> <para> By default,
-                   <application>Evolution</application> saves its mail
-                   in the
-                   <systemitem><filename>mbox</filename></systemitem>
-                   format. You can switch to the
-                   <systemitem><filename>mh</filename></systemitem>
-                   format if you like.  Note that this is an advanced
-                   feature and may cause you to lose some messages, so
-                   you should probably make a backup of your
-                   <systemitem><filename>evolution</filename></systemitem>
-                   directory first. In addition, it will take quite
-                   some time if you have a large mailbox.
-               </para></listitem>
-             </varlistentry>
-           </variablelist>
-        </para>
-      </sect2>
-    </sect1>
 
     <sect1 id="config-prefs-cal">
        <title>Configuring the Calendar</title>
@@ -389,8 +432,8 @@
 	<title>Calendar Preferences Dialog</title>
 	<screenshot>
 	  <screeninfo>If this worked on my job as well as my calendar...</screeninfo>
-	  <graphic fileref="figures/config-cal" format="png" srccredit="Aaron Weber">
-	    </graphic>
+	  <mediaobject><imageobject><imagedata fileref="figures/config-cal" format="png" srccredit="Aaron Weber">
+	    </imageobject></mediaobject>
 	</screenshot>
       </figure>
       <!-- ==============End of Figure================-->
@@ -501,7 +544,7 @@
 	    <para> <guilabel>To-Do item that is not yet
              due:</guilabel> Text color for To-Do list items that are
              not yet due. 
-               </para>
+	    </para>
 	  </listitem>
 
 
@@ -622,43 +665,100 @@
            <title>Adding Directory Servers</title>
            <para>
               To add a new LDAP server to your available contact
-              folders, select <menuchoice> <guimenu>Actions</guimenu>
-              <guimenuitem>New Directory Server</guimenuitem>
-              </menuchoice>.  This brings up a small dialog box which
-              will let you enter the following options:
-              <itemizedlist>
-	         <listitem><para>
-                    <guilabel>Name</guilabel> &mdash; any name you choose for the server.
-                 </para></listitem>
-
-                <listitem><para>
-                    <guilabel>Description</guilabel> &mdash; a longer description of the server.
-                 </para></listitem>
-
-                    <listitem><para>
-                    <guilabel>LDAP Server</guilabel> &mdash; the network address of the server.
-                 </para></listitem> 
-               
-                   <listitem><para>
-                    <guilabel>Port Number</guilabel> &mdash; by default, the port number is 389.
-                 </para></listitem>
-
-                   <listitem><para>
-                    <guilabel>Root DN</guilabel> &mdash; enter the root DN here.
-                 </para></listitem>
-             </itemizedlist>
-         </para>
-       </sect2>
-      </sect1>
+              folders:
+	<orderedlist numeration="arabic">
+	  <listitem>
+	    <para>
+	      Select 
+	      <menuchoice>
+		<guimenu>Tools</guimenu>
+		<guimenuitem>Addressbook Sources</guimenuitem>
+	      </menuchoice>
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click <guibutton>Add</guibutton>.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Enter the server information.
+	      <variablelist>
+		<varlistentry>
+		  <term>Account name</term>
+		  <listitem>
+		    <para>
+		      The name that you see on the screen.  This could be anything you wish.
+		    </para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>Server name</term>
+		  <listitem>
+		    <para>
+		      Address of the server where the addressbook is located.
+		    </para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>My server requires authentication</term>
+		  <listitem>
+		    <para>
+		      Select this if the server needs a password to access the addressbook.
+		    </para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>Port</term>
+		  <listitem>
+		    <para>
+		      The internet port to connect to in order to access the database.  This is normally 389.
+		    </para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>Search base</term>
+		  <listitem>
+		    <para>
+		      The base node to use for all your searches.  Contact your administrator for information about setting this up.
+		    </para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>Search scope</term>
+		  <listitem>
+		    <para>
+		      The scope of the search <!-- FIXME: THIS DEFINITION SUCKS -->
+		    </para>
+		  </listitem>
+		</varlistentry>
+	      </variablelist>
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click <guibutton>OK</guibutton>.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click <guibutton>OK</guibutton> to permanenty make changes or <guibutton>Apply</guibutton> to temporarily set the changes.
+	    </para>
+	  </listitem>
+	</orderedlist>
+      </para>
+    </sect2>
+  </sect1>
     
 
 
   <sect1 id="config-prefs-general">
     <title>General Preferences</title> 
     <para>
-          Additional configuration options will be covered here, as
-          they become available.
-        </para>
+      Additional configuration options will be covered here, as
+      they become available.
+    </para>
   </sect1>
 </chapter>
     
diff --git a/help/no/config-sync.sgml b/help/no/config-sync.sgml
index 8f3b30d1f0..8490f9a84b 100644
--- a/help/no/config-sync.sgml
+++ b/help/no/config-sync.sgml
@@ -15,31 +15,38 @@
            want.
           </member>
         </simplelist>
-
     </para>
 
     <para>
        If you haven't used a handheld device with your computer
        before, you'll need to run the GNOME <application>Control
-       Center</application> and make sure that <application>Pilot
-       Link</application> is properly configured. Then, select the
-       <application>Evolution</application> <glossterm
-       linkend="conduit">conduits</glossterm> under the
-       <guilabel>Pilot Conduits</guilabel> section of the Control
-       Center.
-  </para>
-  
-  <para>
+       Center</application> by selecting
+       <menuchoice><guimenu>System</guimenu><guimenuitem>Settings</guimenuitem></menuchoice>,
+       and make sure that <application>Pilot Link</application> is
+       properly configured.
+    </para>
+    <para>
         Once your computer and your Palm-OS device are talking happily
-        to each other, you'll have to decide what exactly you want
-        them to do with the data they exchange.  To enable a conduit, click the
-        <guibutton>Enable</guibutton> to enable it and click
-        <guibutton>Settings</guibutton>.  Your options may vary
-        depending on the conduit, but typically they will be:
+        to each other, select the <glossterm
+        linkend="conduit">conduits</glossterm> you want under the
+        <guilabel>Pilot Conduits</guilabel> section of the Control
+        Center.  You may use conduits to synchronize data with several
+        applications; the <application>Ximian Evolution</application>
+        conduits are labelled <guilabel>EAddress</guilabel>, for the
+        address cards in your Contact Manager,
+        <guilabel>ECalendar</guilabel>, for your Calendar, and
+        <guilabel>ETodo</guilabel>, for your Task List.
+    </para>
+   <para>
+      To enable a conduit, click the
+        <guibutton>Enable</guibutton> to enable it, and click
+        <guibutton>Settings</guibutton> to change what it will do when
+        activated.  Your options may vary depending on the conduit,
+        but typically they will be:
 
         <variablelist>
          <varlistentry>
-            <term>Disabled </term>
+            <term>Disabled</term>
             <listitem> 
                <para>
                   Do nothing.
@@ -103,20 +110,18 @@
     </para>
 
     <para>
-      Select a behavior for each conduit available.  For the most
-      part, you'll want to stick with
+      Select the behavior you want for each conduit you choose to use.
+      If you're not sure, go ahead and stick with
       <guilabel>Synchronize</guilabel>.  Then, put your handheld on
-      its cradle and press the synchronization button.
+      its cradle and press the HotSync button.
     </para>
-
-
       <para> 
          <tip> 
 	  <title>Data Loss Prevention</title> 
 	  <para>
 	    It's always a good idea to make a backup.  To do that,
-	    make a copy of your <systemitem>
-	    <filename>~/evolution</filename> </systemitem> directory.
+	    make a copy of the <filename>evolution</filename>
+	    directory inside your home directory.
           </para>
 	</tip>
        </para>
diff --git a/help/no/evolution.sgml b/help/no/evolution.sgml
index 8db87fdf29..29a6a87141 100644
--- a/help/no/evolution.sgml
+++ b/help/no/evolution.sgml
@@ -1,4 +1,4 @@
-<!DOCTYPE book PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN"[
 
 <!ENTITY PREFACE SYSTEM "preface.sgml">
 <!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.sgml">
diff --git a/help/no/menuref.sgml b/help/no/menuref.sgml
index a2a4ea1b32..bc5008f68d 100644
--- a/help/no/menuref.sgml
+++ b/help/no/menuref.sgml
@@ -1,1138 +1,372 @@
 <!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
+<!DOCTYPE Appendix PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
 -->
 
-<chapter id="menuref">
-  <title>Menu Reference</title>
+<appendix id="menuref">
+  <title>Quick Reference</title>
   <para>
-    <application>Evolution</application>'s menus may not hold the
-    secret to happiness, they do hold every ability that
-    <application>Evolution</application> has. This section will serve
-    as a reference for all those menus, and the capabilites that they
-    offer you.
-  </para>
-  <para>
-    In addition, the editor tools for messages, appointments, and
-    contacts all have menu bars of their own. From left to right, the
-    menus available to you when you are reading mail are:
-    <guimenu>File</guimenu>, <guimenu>Edit</guimenu>,
-    <guimenu>View</guimenu>, <guimenu>Settings</guimenu>,
-    <guimenu>Message</guimenu>, <guimenu>Folder</guimenu>and
-    <guimenu>Help</guimenu>.
-
-  </para>
-  <para>
-    Menus in <application>Evolution</application> are
-    context-sensitive, which means that they vary depending on what
-    you're doing.  If you're reading your mail, you'll have
-    mail-related menus; for your calendar, you'll have
-    calendar-related menu items.  Some menus, of course, like
-    <guimenu>Help</guimenu> and <guimenu>File</guimenu> don't much, if
-    at all, because they have more universal functions.  But you'd
-    never mark an address card as "read," or set the recurrence for an
-    email message you've recieved. depending on whether you're looking
-    at mail, contacts, or calendar information. 
-  </para>
-
-   <sect1 id="menuref-mail">
-     <title>Mail Menus</title>
-     <para>
-           Note that the <guimenu>File</guimenu> menu and the
-	  <guimenu>Help</guimenu> are identical within the
-	  <application>Evolution</application> main window, regardless
-	  of what features you are using. 
-
-        <variablelist>
-          <varlistentry>
-	  <term>File Menu</term>
-          <listitem> <para>
-              <variablelist>
-		<varlistentry>
-		  <term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Mail
-	           Message</guimenuitem></menuchoice></term>
-		  <listitem>
-		    <para>
-                   <keycombo action="simul"><keycap>Ctl</keycap>
-		      <keycap>N</keycap>
-		      </keycombo>
-                     </para></listitem>
-		</varlistentry>
-
-		<varlistentry>
-		  <term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Evolution
-		   Window</guimenuitem></menuchoice></term>
-		   <listitem><para><keycombo action="simul">
-		   <keycap>Shft</keycap><keycap>Ctl</keycap><keycap>W</keycap></keycombo></para></listitem>
-		</varlistentry>
-
-		<varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Shortcut</guimenuitem></menuchoice></term>
-	<listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>S</keycap></keycombo></para></listitem>
-     </varlistentry>
-
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Mail
-		 Message</guimenuitem></menuchoice></term>
-	 <listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>M</keycap></keycombo></para></listitem>
-     </varlistentry>
-
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Appointment</guimenuitem></menuchoice></term>
-	<listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>A</keycap></keycombo></para></listitem>
-     </varlistentry>
-
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Contact</guimenuitem></menuchoice></term>
-	<listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>C</keycap></keycombo></para></listitem>
-     </varlistentry>
-
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Task</guimenuitem></menuchoice></term>
-	  <listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>T</keycap></keycombo></para></listitem>
-     </varlistentry>
-
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Open Selected Items</guimenuitem></menuchoice></term>
-	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>O</keycap></keycombo></para></listitem>
-     </varlistentry>
-
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Save As</guimenuitem></menuchoice></term>
-	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>Alt</keycap><keycap>S</keycap></keycombo></para></listitem>
-     </varlistentry>
-
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guisubmenu>Folder</guisubmenu>
-	<guimenuitem>New Folder</guimenuitem></menuchoice></term>
-	<listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>F</keycap></keycombo></para></listitem>
-     </varlistentry>
-
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Go to Folder</guimenuitem></menuchoice></term>
-	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>G</keycap></keycombo></para></listitem>
-     </varlistentry>
-
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Print</guimenuitem></menuchoice></term>
-	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>P</keycap></keycombo></para></listitem>
-     </varlistentry>
-
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Close</guimenuitem></menuchoice></term>
-	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>W</keycap></keycombo></para></listitem>
-     </varlistentry>
-	
-     <varlistentry>
-	<term><menuchoice><guimenu>File</guimenu><guimenuitem>Exit</guimenuitem></menuchoice></term>
-  	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>Q</keycap></keycombo></para></listitem>
-     </varlistentry>
-    </variablelist>
-     </para>
-    </listitem>
-   </varlistentry>
-    <varlistentry>
-      <term>Edit Menu</term>
-      <listitem><para>
-       <variablelist>
-	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Select All</guimenuitem></menuchoice></term>
-		  <listitem><para><keycombo action="simul"><keycap>
-	           Ctl</keycap><keycap>A</keycap></keycombo>
-		  </para></listitem></varlistentry>
-	
-	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Invert Selection</guimenuitem></menuchoice></term>	
-	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>I</keycap></keycombo>
-		  </para></listitem></varlistentry>
-	
-	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Delete</guimenuitem></menuchoice></term>		
-	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>D</keycap></keycombo>
-		  </para>
-		  </listitem></varlistentry>
-	
-	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Undelete</guimenuitem></menuchoice></term>		
-	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>U</keycap></keycombo>
-		  </para>
-		  </listitem></varlistentry>
-	
-	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Mark as Read</guimenuitem></menuchoice></term>		
-	<listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>K</keycap></keycombo>
-		  </para>
-		  </listitem></varlistentry>
-	
-	<varlistentry><term><menuchoice><guimenu>Edit</guimenu><guimenuitem>Mark as Unread</guimenuitem></menuchoice></term>		
-	<listitem><para><keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>K</keycap></keycombo>
-		  </para>
-		  </listitem></varlistentry>
-        </variablelist>
-      </para> </listitem>
-      </varlistentry>
-      
-    <varlistentry>
-      <term>View Menu</term>
-      <listitem>
-	<variablelist>
-	  <varlistentry>
-	    <term><menuchoice><guimenu>View</guimenu><guimenuitem>Threaded</guimenuitem></menuchoice></term>
-	    <listitem><para><keycombo action="simul"><keycap>Ctl</keycap><keycap>T</keycap></keycombo></para></listitem>
-	  </varlistentry>
-        </variablelist>
-      </listitem>
-    </varlistentry>
-    
-    <varlistentry>
-      <term>Actions Menu</term>
-      <listitem>
-	<variablelist>
-	  
-	   <varlistentry>
-	<term><menuchoice><guimenu>Actions</guimenu><guisubmenu>Forward
-			    As</guisubmenu><guimenuitem>Inline</guimenuitem>
-		    </menuchoice> </term>
-		  <listitem>
-		    <para>
-	              <keycombo action="simul">
-			<keycap>Shft</keycap><keycap>Ctl</keycap><keycap>J</keycap>
-		      </keycombo>
-	             </para>
-		  </listitem>
-		</varlistentry>
-		<varlistentry>
-		  <term><menuchoice>
-		      <guimenu>Actions</guimenu><guisubmenu>Forward As</guisubmenu>
-		      <guimenuitem>Attachment</guimenuitem>
-		  </menuchoice></term>
-	  <listitem><para>
-	        <keycombo action="simul">
-			<keycap>Ctl</keycap><keycap>F</keycap>
-		      </keycombo>
-	         </para></listitem>
-		</varlistentry>
-		
-		<varlistentry>
-		  <term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Reply</guimenuitem>
-		    </menuchoice></term> <listitem><para>
-	        <keycombo action="simul">
-			<keycap>Ctl</keycap><keycap>R</keycap>
-		      </keycombo>
-	         </para></listitem>
-		</varlistentry>
-
-	   <varlistentry>
-		  <term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Reply to All</guimenuitem>
-		    </menuchoice></term>		
-		  <listitem><para>
-	        <keycombo action="simul"><keycap>Shft</keycap><keycap>Ctl</keycap><keycap>R</keycap>
-		      </keycombo>
-	         </para></listitem>
-		</varlistentry>
-		
-	   <varlistentry>
-	<term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Move
-			  to Folder</guimenuitem> </menuchoice></term>
-		  <listitem><para> <keycombo
-		  action="simul"><keycap>Ctl</keycap><keycap>M</keycap>
-		      </keycombo>
-	         </para></listitem>
-		</varlistentry>
-	
-
-	   <varlistentry>
-		  <term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Copy to Folder	</guimenuitem>
-		    </menuchoice></term>	
-		  <listitem><para>
-	        <keycombo action="simul"><keycap>>Ctl</keycap><keycap>C</keycap>
-		      </keycombo>
-	         </para></listitem>
-		</varlistentry>
-
-	
-	   <varlistentry>
-	<term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Apply
-			  Filters </guimenuitem> </menuchoice></term>
-		  <listitem><para> <keycombo
-		  action="simul"><keycap>Ctl</keycap><keycap>Y</keycap>
-		      </keycombo>
-	         </para></listitem>
-		</varlistentry>
-
-	
-		<varlistentry>
-		  <term><menuchoice><guimenu>Actions</guimenu><guimenuitem>Expunge
-		  </guimenuitem> </menuchoice></term> <listitem><para>
-		  <keycombo
-		  action="simul"><keycap>Ctl</keycap><keycap>X</keycap>
-		      </keycombo>
-	         </para></listitem>
-		</varlistentry>
-	
-		<varlistentry>
-		  <term><menuchoice><guimenu>Help</guimenu><guimenuitem>Index
-		  </guimenuitem> </menuchoice></term>	  
-		  <listitem><para> <keycombo
-		  action="simul"><keycap>Ctl</keycap><keycap>H</keycap></keycombo>
-		  </para></listitem>
-                 </varlistentry>
-      
-	    </variablelist>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
-
-
-    </para>       
-
-   </sect1>
-  <sect1 id="menuref-mail-editor">
-    <title>The Message Composer Menus</title>
-    <para>
-      The message composition window has its own set of menus:
-      <guimenu>File</guimenu>, which controls operations on files and
-      data, <guimenu>Edit</guimenu>, for text editing,
-      <guimenu>Format</guimenu>, which controls the file format of
-      messages you send, <guimenu>View</guimenu>, to set how you view
-      the message, and <guimenu>Insert</guimenu>, which holds tools
-      for embedding files and other items in messages.  Here's what's in them:
-    </para>
-    <sect2 id="menuref-mail-editor-file">
-      <title>The Message Composer's File Menu</title>
+      You might want to copy this section and tape it to the wall
+      next to your computer: it's a very short summary of most of
+      the things you'll want to do with
+      <application>Ximian Evolution</application>.
+   </para>
+
+
+<note id="shortcuts">
+<title>Custom Keyboard Shortcuts</title>
+<para>
+  If you have set custom keyboard shortcuts for your desktop, (you can
+   do this the control center: select
+   <menuchoice><guimenu>System</guimenu><guimenuitem>Settings</guimenuitem></menuchoice>
+   from your menu panel), they may interfere with Evolution keyboard
+   shortcuts.
+</para>
+<para>
+   For example, if you have chosen Emacs-style key bindings for your
+   desktop-wide text editor, the shortcut
+   <keycombo action="simul">
+    <keycap>Ctrl</keycap>
+    <keycap>W</keycap>
+  </keycombo>
+  will act as "Cut region" rather than as "Close Window" in the
+  message composer.
+</para>
+</note>
+
+
+
+
+  <sect1 id="quickref-open">
+      <title>Opening or Creating Anything</title>
       <para>
-        <variablelist>
-	  <varlistentry>
-	      <term><guimenu>Open</guimenu></term>
-	      <listitem><para>
-		 Open a text file or a draft mail message.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Save</guimenu></term>
-	      <listitem><para>
-		 Save a mail message as a text file.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Save As</guimenu></term>
-	      <listitem><para> 
-		Choose a file name and location for
-		a message you want to save as a text file.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Save in Folder</guimenu></term>
-	      <listitem><para>
-		 Save a message as a draft, rather than 
-		 as a separate text file.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Insert Text File</guimenu></term>
-	      <listitem><para>
-		   Open a text file and insert it into 
-		   the current message. (FIXME: belongs under "Insert").
-	      </para></listitem>
-	    </varlistentry>
-	  
-	    <varlistentry>
-	      <term><guimenu>Send Now</guimenu></term>
-	      <listitem><para>
-		  Sends the message immediately.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Send Later</guimenu></term>
-	      <listitem><para>
-		  Queue 
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenu>Close</guimenu></term>
-	    <listitem><para>
-		 Closes the message composer.  If you have not done so, 
-		 <application>Evolution</application>
-		 will ask you if you want to save your message.
-	      </para></listitem>
+          <variablelist>
+
+	  <varlistentry>
+	    <term>Create a new folder</term>
+	    <listitem>
+	      <para>
+                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu>
+                <guimenuitem>Folder</guimenuitem></menuchoice> or
+                <keycombo action="simul">
+		  <keycap>Ctrl</keycap>
+		  <keycap>Shift </keycap>
+		  <keycap>E</keycap>
+                </keycombo>
+                </para>
+	    </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term>Create a new Shortcut in the Evolution Bar</term>
+	    <listitem>
+	      <para>       
+                  <menuchoice><guimenu>File</guimenu>
+		  <guisubmenu>New</guisubmenu>
+		  <guimenuitem>Evolution Bar Shortcut</guimenuitem> </menuchoice> or 
+                <keycombo action="simul">
+		  <keycap>Ctrl</keycap>
+		  <keycap>Shift</keycap>
+		  <keycap>S</keycap>
+                </keycombo>
+                </para>
+	    </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term>Create a new email message:</term>
+	    <listitem>
+	      <para>
+                Use
+                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Mail
+                Message</guimenuitem>  </menuchoice> or 
+                <keycombo action="simul">
+		  <keycap>Ctrl</keycap>
+		  <keycap>Shift </keycap>
+		  <keycap>M</keycap>
+                </keycombo>
+              </para>
+	    </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term>Create a new Appointment</term>
+	    <listitem>
+	      <para>       
+                  <menuchoice><guimenu>File</guimenu>
+		  <guisubmenu>New</guisubmenu>
+		  <guimenuitem>Appointment</guimenuitem> </menuchoice>  or 
+                <keycombo action="simul">
+		  <keycap>Ctrl</keycap>
+		  <keycap>Shift</keycap>
+		  <keycap>A</keycap>
+                </keycombo>
+                </para>
+	    </listitem>
+	  </varlistentry>
+
+
+	  <varlistentry>
+	    <term>Enter a new Contact</term>
+	    <listitem>
+	      <para>       
+                  Double-click in any blank space in the contact
+                  manager to create a new address card.  You can also
+                  use 
+                 <menuchoice><guimenu>File</guimenu>
+		  <guisubmenu>New</guisubmenu>
+		  <guimenuitem>Contact</guimenuitem> </menuchoice>  or 
+                <keycombo action="simul">
+		  <keycap>Ctrl</keycap>
+		  <keycap>Shift</keycap>
+		  <keycap>C</keycap>
+                </keycombo>
+                </para>
+	    </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term>Create a new Task</term>
+	    <listitem>
+	      <para>       
+                  <menuchoice><guimenu>File</guimenu>
+		  <guisubmenu>New</guisubmenu>
+		  <guimenuitem>Task</guimenuitem>  </menuchoice> or 
+                <keycombo action="simul">
+		  <keycap>Ctrl</keycap>
+		  <keycap>Shift</keycap>
+		  <keycap>T</keycap>
+                </keycombo>
+                </para>
+	    </listitem>
 	  </varlistentry>
 	</variablelist>
       </para>
-    </sect2>
-
-
-<sect2 id="menuref-tasklist">
-      <title>Task List Shortcuts and Menus</title>
-      <para>
-      </para>
-</sect2>
-        
-    <sect2 id="menuref-mail-editor-edit">
-      <title>The Message Composer's Edit Menu</title>
+    </sect1> 
+    <sect1 id="quickref-mail">
+      <title>Mail Tasks</title>
       <para>
-          The <guimenu>Edit</guimenu> menu in the message composer
-          contains the following items.  Keyboard shortcuts are listed
-          next to the items in the menus themselves.
-
-        <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Undo</guimenuitem></term>
-	    <listitem><para>
-                Undoes the last action you performed.
-	    </para></listitem>
-	  </varlistentry>
-
-    	  <varlistentry>
-	    <term><guimenuitem>Redo</guimenuitem></term>
-	    <listitem><para>
-               If you change your mind about Undoing something, 
-               you can always use this item.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Cut</guimenuitem></term>
-	    <listitem><para>
-                Removes the selected text from the text entry window and 
-                retains it in the system "clipboard" memory, ready for pasting.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Copy</guimenuitem></term>
-	    <listitem><para>
-              Copies selected text to the system clipboard without deleting it.
-              The text can then be inserted elsewhere with the 
-              <guimenuitem>Paste</guimenuitem> command.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Paste</guimenuitem></term>
-	    <listitem><para>
-                Inserts the contents of the system clipboard at the 
-                location of the cursor.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Find</guimenuitem></term>
-	    <listitem><para>
-               Enter a phrase and find your match in your message body.
-               As with <guimenuitem>Find Regex</guimenuitem>, 
-               <guimenuitem>Find Again</guimenuitem>, and
-               <guimenuitem>Replace</guimenuitem>, <application>Evolution</application>
-                will offer you the option to search forwards or backwards.
-	    </para></listitem>
-	  </varlistentry>
+        Here are the most frequent email tasks, and shortcuts for
+        navigating your mailbox with the keyboard instead of the
+        mouse:
+         <variablelist>
 
-	  <varlistentry>
-	    <term><guimenuitem>Find Regex</guimenuitem></term>
-	    <listitem><para>
-               If you are familiar with <glossterm>regular expressions</glossterm>,
-                often called "regexes," you can search for something more complicated, 
-               using wildcards and boolean logic.
-	    </para></listitem>
+  
+        <varlistentry>
+	    <term>Send and Receive Mail</term>
+	    <listitem>
+	      <para>
+                Press <keycap>F9</keycap>, click the
+                <guibutton>Send/Receive</guibutton> button in the
+                toolbar, or choose
+                <menuchoice><guimenu>Actions</guimenu> 
+                 <guimenuitem>Send/Receive</guimenuitem></menuchoice>.
+                </para>
+	    </listitem>
+	  </varlistentry>
+        <varlistentry>
+	    <term>Navigating the Message List with the Keyboard</term>
+	    <listitem>
+	      <para>
+                Press <keycap>N</keycap> to jump to the next unread
+                message. <keycap>P</keycap> goes to the previous
+                unread message.  Use the arrow keys to move up
+                and down along the list of all message.
+                </para>
+	    </listitem>
 	  </varlistentry>
 
-	  <varlistentry>
-	    <term><guimenuitem>Find Again</guimenuitem></term>
-	    <listitem><para>
-              Repeats your last search.
-	    </para></listitem>
+          <varlistentry>
+	    <term>Move the display up and down in the preview pane</term>
+	    <listitem>
+	      <para>
+                Press the space bar to go a page down.  Press
+                <keycap>Backspace</keycap> to go a page up.
+                </para>
+	    </listitem>
 	  </varlistentry>
 
-	  <varlistentry>
-	    <term><guimenuitem>Replace</guimenuitem></term>
-	    <listitem><para>
-               Enter a word or phrase and the word or phrase with which you'd like
-               to replace it.  
-	    </para></listitem>
+          <varlistentry>
+	    <term>Reply to a Message</term>
+	    <listitem>
+	      <para>
+                To reply to the sender of the message only:
+                click <guibutton>Reply</guibutton> in the
+                toolbar, or press
+                <keycombo action="simul">
+		  <keycap>Ctrl</keycap>
+		  <keycap>R</keycap>
+                </keycombo>
+                </para>
+	      <para>
+                To reply to the sender and all the other visible
+                recipients of the message, click <guibutton>Reply to
+                All</guibutton> or select the message and press
+                <keycombo action="simul">
+		  <keycap>Shift</keycap>
+		  <keycap>Ctrl</keycap>
+		  <keycap>R</keycap>
+                </keycombo>
+              </para>
+	    </listitem>
 	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Properties</guimenuitem></term>
-	    <listitem><para>
-               This item brings up the Message Composer Properties Capplet, 
-               a portion of the GNOME Control Center that determines the 
-               key bindings for the message composer.  Help for this capplet is 
-               available directly from the Control Center.
-               (FIXME: Write that help doc too) (FIXME: this is in the wrong place!)
-	    </para></listitem>
+	  
+          <varlistentry>
+	    <term>Forward a Message</term>
+	    <listitem>
+	      <para>
+                Select the message or messages you want to forward,
+                and click <guibutton>Forward</guibutton> in the
+                toolbar, or press
+                <keycombo action="simul">
+		  <keycap>Ctrl</keycap>
+		  <keycap>F</keycap>
+                </keycombo>
+                </para>
+	    </listitem>
 	  </varlistentry>
 
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-format">
-      <title>The Message Composer's Format Menu</title>
-      <para> 
-        The <guimenu>Format</guimenu> menu has only one item:
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>HTML</guimenuitem></term>
-	    <listitem><para>
-                 Toggles HTML mode for the message composer.  When selected, 
-                 the message is displayed and sent in HTML.  If you have written a 
-                 message in HTML and turn HTML off, most formatting will be lost.
-                 <application>Evolution</application> will attempt to preserve spacing
-                 and to remove formatting gracefully, however.
-	    </para></listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-view">
-      <title>The Message Composer's View Menu</title>
-      <para>
-        The <guimenu>View</guimenu> menu controls the way messages are
-        displayed, and how much of the message, its headers, and
-        attachments appear.  It contains:
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Attachments</guimenuitem></term>
-	    <listitem><para> 
-              Toggles the display of attachments.  When this item is selected,
-              <application>Evolution</application> will create a separate pane
-              of the composition window to show what attachments you are appending
-              to the message. 
-	    </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-insert">
-      <title>The Message Composer's Insert Menu</title>
-      <para>
-        The <guimenu>Insert</guimenu> menu holds tools that allow you
-        to include images, horizontal rules, and other objects
-        in the body of your message. The tools are:
-        <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Image</guimenuitem></term>
-	    <listitem><para> 
-               This tool will prompt you to select an image file to 
-               insert into your HTML message.  For text messages, this
-               is the same as attaching an image file.
-	    </para></listitem>
+          <varlistentry>
+	    <term>Open a Message in a New Window</term>
+	    <listitem>
+	      <para>
+                Double-click the message you want to view, or select
+                it and press
+                <keycombo action="simul">
+		  <keycap>Ctrl</keycap>
+		  <keycap>O</keycap>
+                </keycombo>
+	      </para>
+	    </listitem>
 	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Link</guimenuitem></term>
-	    <listitem><para> 
-               Opens the <interface>link creation window</interface>, 
-               which lets you specify the URL and text description
-               for a link in your message.  This only works with HTML 
-               messages.
-	    </para></listitem>
+	  
+          <varlistentry>
+	    <term>Create Filters and Virtual Folders</term>
+	    <listitem>
+	      <para>
+                Right-click on a message and select
+                <guimenuitem>Create Rule From
+                Message</guimenuitem>. You can also create filters and
+                virtual folders in the <guimenu>Tools</guimenu> menu.
+	      </para>
+	    </listitem>
 	  </varlistentry>
 
-	  <varlistentry>
-	    <term><guimenuitem>Rule</guimenuitem></term>
-	    <listitem><para>    
-             Opens the<interface> horizontal rule creation dialog</interface>, which lets you
-	     create an HTML horizontal rule.  For more information,
-	     see <xref linkend="usage-mail-getnsend-send-html">.
-             This tool only works with HTML messages.
-	     </para></listitem>
-	  </varlistentry>
 
-	  <varlistentry>
-	    <term><guimenuitem>Text File</guimenuitem></term>
-	    <listitem><para>
-	       Open a text file and insert it into the current message.
-               This tool works with both plain text and HTML messages.
-	      </para></listitem>
+          <varlistentry>
+	    <term>Add Sender to Address Book</term>
+	    <listitem>
+	      <para>
+                Right-click on a message and select <guimenuitem>Add
+                Sender to Address Book</guimenuitem>.  You can also
+                right-click on any email address to add it to your
+                address book.
+	      </para>
+	    </listitem>
 	  </varlistentry>
 	</variablelist>
-      </para>
-    </sect2>
-  </sect1>
+	
 
-    <sect1 id="menuref-cal">
-    <title>The Calendar Menus</title>
-    <para>
-      The Main window of the calendar has the same menus as the main
-      window of the mail client.  However, their contents vary in a
-      number of ways.
-    </para>
-    <sect2 id="menuref-cal-edit">
-      <title>The Calendar Edit Menu</title>
-      <para>
-         The contents of the Edit menu are currently so borked that I
-         refuse to document them right now. (That means FIXME). They
-         should be:
 
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Item</guimenuitem></term>
-	    <listitem><para>
-              Description
-           </para></listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guimenuitem>Item</guimenuitem></term>
-	    <listitem><para>
-              Description
-           </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	  <term><guimenuitem>Item</guimenuitem></term>
-	  <listitem><para>
-              Description
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
       </para>
-    </sect2>
-    <sect2 id="menuref-cal-view">
-      <title>The Calendar View Menu</title>
+    </sect1>
+    <sect1 id="quickref-cal">
+      <title>Calendar</title>
       <para>
-        The Calendar's <guimenu>View</guimenu> menu contains the following items:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>
-	    <listitem><para>
-              Toggle the Shortcut Bar on and off with this item.              
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Show Folder Bar</guimenuitem></term>
-	    <listitem><para>
-             Toggle the folder bar on and off with this item. 
-             See <xref linkend="usage-mainwindow-folderbar"> for 
-             more information about the folder bar.     
-           </para></listitem>
-	  </varlistentry>
-		  
-	  <varlistentry>
-	  <term><guimenuitem>View By Day</guimenuitem></term>
-	  <listitem><para>
-             Switch to the day view for your calendar.
-           </para></listitem>
-	  </varlistentry>	  
-
-	  <varlistentry>
-	  <term><guimenuitem>View Five Days</guimenuitem></term>
-	  <listitem><para>
-             View five calendar days at once. 
-           </para></listitem>
-	  </varlistentry>	  
-
-	  <varlistentry>
-	  <term><guimenuitem>View by Week</guimenuitem></term>
-	  <listitem><para>
-             Switch the calendar view to full week mode.
-           </para></listitem>
-	  </varlistentry>
-  
+        <variablelist>
 	  <varlistentry>
-	  <term><guimenuitem>View By Month</guimenuitem></term>
-	  <listitem><para>
-             Look at a month at a time.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-settings">
-      <title>The Calendar Settings Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
+	    <term></term>
+	    <listitem>
+	      <para>
+		<tip id="new-appt">
+		  <title>New Appointments Fast</title>
+		  <para>
+		    Click on any blank spot in the calendar and start
+		    typing to create a new appointment entry.
+		  </para>
+		</tip>
+	      </para>
+	    </listitem>
+	    </varlistentry>
+	  </variablelist>
 
+        </para>
   </sect1>
+    <sect1 id="quickref-contact">
+        <title>Contact Manager</title>
+        <para>
+	Here are the most frequent tasks that are done in the Contact Manager,
+	with the shortcuts so that you can use these tasks without having to use
+	your mouse:
 
-  <sect1 id="menuref-cal-editor">
-    <title>The Appointment Editor Menus</title>
-    <para>
-    The appointment editor has its own menus, to help you use its
-    wide-ranging abilities.
-    </para>
-    
-    <sect2 id="menuref-cal-editor-file">
-      <title>The Appointment Editor's File Menu</title>
-      <para>
-         This menu contains several items, including a
-         <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu></menuchoice>
-         submenu that is identical to that in the main window.  The
-         other contents are:
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Send</guimenuitem></term>
-	    <listitem><para>
-             Opens a mail message with the appointment attached to it.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Save</guimenuitem></term>
-	    <listitem><para>
-              Save this appointment in the existing location and name. If you have not yet
-              chosen a location and name, this is the same as <guimenuitem>Save As</guimenuitem>.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Save As</guimenuitem></term>
-	    <listitem><para>
-              Choose a location and name for this appointment, and save it.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Delete</guimenuitem></term>
-	    <listitem><para>
-              Deletes the appointment.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Move to Folder</guimenuitem></term>
-	    <listitem><para>
-              Chose a folder, and move the appointment into it.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Copy to Folder</guimenuitem></term>
-	    <listitem><para>
-              Chose a folder, and put a copy of the appointment into it.
-           </para></listitem>
-	  </varlistentry>
-
-
+        <variablelist>
 	  <varlistentry>
-	    <term><guimenuitem>Page Setup Submenu</guimenuitem></term>
-	    <listitem><para>
-             This menu contains two items:
-                <itemizedlist>
-		  <listitem><para>
-                   <guimenuitem>Memo Style</guimenuitem> &mdash;
-                    FIXME: What does this do?
-                   </para></listitem>
-
-		  <listitem><para>
-                    <guimenuitem>Define Print Styles</guimenuitem> &mdash;
-                    FIXME: What does this do?
-                  </para></listitem>
+	    <term>Edit a Contact</term>
+	    <listitem>
+	      <para>
+		You can edit a contact two ways:
+		<itemizedlist>
+		  <listitem>
+		    <para>
+		      Click once on the person's address card and you can
+		      edit the person's properties all in the same window.
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Double-click on the contact's card and alter their details.
+		    </para>
+		  </listitem>
 		</itemizedlist>
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Print Preview</guimenuitem></term>
-	    <listitem><para> Shows you what your appointment will look
-	    like if you print it. See <xref linkend="usage-print">
-	    for details on printing and the Print Preview function.
-	    </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Print</guimenuitem></term>
-	    <listitem><para>
-              Prints the appointment without preview.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Properties</guimenuitem></term>
-	    <listitem><para>
-             FIXME: What does this do?
-           </para></listitem>
-	  </varlistentry>
-
-
+               </para>
+	    </listitem>
+	    </varlistentry>
+	  </variablelist>
+	
+	<variablelist>
 	  <varlistentry>
-	    <term><guimenuitem>Close</guimenuitem></term>
-	    <listitem><para>
-             Close the appointment editor window.
-           </para></listitem>
+	    <term>Deleting a Contact</term>
+	    <listitem>
+	      <para>
+		Right click on a contact and click <guilabel>Delete</guilabel>
+		or select a contact and press the <guibutton>Delete</guibutton>
+		on the <guilabel>toolbar</guilabel>.
+	      </para>
+	    </listitem>
 	  </varlistentry>
 	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-edit">
-      <title>The Appointment Editor's Edit Menu</title>
-      <para>
-         FIXME: this menu is copied and pasted entirely from somewhere
-         else.
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-view">
-      <title>The Appointment Editor's View Menu</title>
-      <para>
-         This menu allows you to look at different appointments, and
-         set the way you look at them, without having to move back to
-         the <interface>Main Window</interface>. It contains:
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guisubmenu>Previous</guisubmenu></term>
-	    <listitem><para>
-               The items in this submenu will take you to appointments
-               prior to the current one. (FIXME: describe).
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guisubmenu>Next</guisubmenu></term>
-	    <listitem><para>
-               The items in this submenu will take you to appointments
-               scheduled to occur after the current one. (FIXME: describe).
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Calendar</guimenuitem></term>
-	    <listitem><para>
-               FIXME: What does this item do?
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guisubmenu>Toolbars</guisubmenu></term>
-	    <listitem><para>
-             The <guisubmenu>Toolbars</guisubmenu> submenu 
-             allows you to choose which toolbars
-             are displayed in the 
-             <interface>Appointment Editor</interface>. They are:
-             <itemizedlist>
-		  <listitem><para>
-                    <guimenuitem>Standard</guimenuitem> &mdash;
-                    Toggle the standard toolbar on and off.
-                   </para></listitem>
-
-		  <listitem><para>
-                    <guimenuitem>Formatting</guimenuitem> &mdash;
-                    Toggle the formatting toolbar on and off.
-                   </para></listitem>
 	
-		  <listitem><para>
-                    <guimenuitem>Customize</guimenuitem> &mdash;
-                    Select the contents of the formatting and standard toolbars.
-                   </para></listitem>
-		</itemizedlist>
-            </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-insert">
-      <title>The Appointment Editor's Insert Menu</title>
-      <para>
-        This menu contains: (FIXME: Insert Content Here)
+	
         <variablelist>
 	  <varlistentry>
-	    <term><guimenuitem>File</guimenuitem></term>
-	    <listitem><para>
-             Choose a file to append to your appointment or appointment request.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Item</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Object</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-format">
-      <title>The Appointment Editor's Format Menu</title>
-      <para>
-         This menu contains two items, neither of which
-         have any functionality yet:
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Font</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Paragraph</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-tools">
-      <title>The Appointment Editor's Tools Menu</title>
-      <para>
-         This menu contains four items, including the
-         <guisubmenu>Forms</guisubmenu> submenu, which allows you to
-         alter calendar forms and create your own entries.  None of
-         this works yet, though.
-
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Spelling</guimenuitem></term>
-	    <listitem><para>
-              Checks the spelling of your calendar entry.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Check Names</guimenuitem></term>
-	    <listitem><para> Checks the names listed here against
-	    those in your address book.
-            </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Address Book</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guisubmenu>Forms</guisubmenu> Submenu</term>
-	    <listitem><para>
-               The Forms submenu lets you alter the
-	       appearance of Calendar Forms. 
-           </para></listitem>
+	    <term>Email a Contact</term>
+	    <listitem>
+	      <para>
+		Right click on a contact and select 
+		<guilabel>Send message to contact</guilabel>.
+               </para>
+	    </listitem>
 	  </varlistentry>
 	</variablelist>
-
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-actions">
-      <title>The Appointment Editor's Actions Menu</title>
-      <para>
-        This menu contains:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Schedule Meeting</guimenuitem></term>
-	    <listitem><para>
-              Brings up the <interface>Meeting Invitation</interface> window, 
-              described in <xref linkend="usage-calendar-apts">.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Cancel Invitation</guimenuitem></term>
-	    <listitem><para>
-              Cancels the event, notifying all attendees.  You may be prompted 
-              to specify an invitation message.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Forward as vCalendar</guimenuitem></term>
-	    <listitem><para>
-              Opens the message composer with the current event attached.
-           </para></listitem>
-	  </varlistentry>
-
+	
+        <variablelist>
 	  <varlistentry>
-	    <term><guimenuitem>Forward as Text</guimenuitem></term>
-	    <listitem><para>
-              Opens the message composer with a text description of the current
-              event included in the message body.
-           </para></listitem>
+	    <term>Creating a New Contact</term>
+	    <listitem>
+	      <para>
+                  Double-click in any blank space in the contact
+                  manager to create a new address card.  You can also
+                  use <menuchoice><guimenu>File</guimenu>
+                  <guisubmenu>New</guisubmenu>
+                  <guimenuitem>Contact</guimenuitem> </menuchoice> or
+                <keycombo action="simul">
+		  <keycap>Ctrl</keycap>
+		  <keycap>Shift</keycap>
+		  <keycap>C</keycap>
+                </keycombo>
+	      </para>
+	    </listitem>
 	  </varlistentry>
 	</variablelist>
       </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-help">
-      <title>The Appointment Editor's File Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
-
   </sect1>
-
-  <sect1>
-    <title>Contact Manager Menus</title>
-    <para>
-     The contact manager has six menus: <guimenu>File</guimenu>,
-     <guimenu>Edit</guimenu>, <guimenu>View</guimenu>,
-     <guimenu>Setting</guimenu>s, <guimenu>Tools</guimenu>, and
-     <guimenu>Help</guimenu>.
-    </para>
-
-    <sect2 id="menuref-contact-edit">
-      <title>Contact Manager Edit Menu</title>
-      <para>
-         This menu is empty.
-      </para>
-    </sect2>
-
-
-    <sect2 id="menuref-contact-view">
-      <title>Contact Manager View Menu</title>
-      <para>
-        This menu contains the following items:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>
-	    <listitem><para>
-              Toggle the Shortcut Bar on and off with this item.              
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Show Folder Bar</guimenuitem></term>
-	    <listitem><para>
-             Toggle the folder bar on and off with this item. 
-             See <xref linkend="usage-mainwindow-folderbar"> for 
-             more information about the folder bar.     
-           </para></listitem>
-	  </varlistentry>
-		  
-	  <varlistentry>
-	  <term><guimenuitem>As Table</guimenuitem> / <guimenuitem>As Minicards</guimenuitem></term>
-	  <listitem><para>
-             View your contacts as a table.  
-             When in table-view mode, this menu item reads 
-             <guimenuitem>As Minicards</guimenuitem>, and changes the view
-             back to the minicard format.
-           </para></listitem>
-	  </varlistentry>	  
-	</variablelist>      
-      </para>
-    </sect2>
-
-   <sect2 id="menuref-contact-tools">
-      <title>Contact Manager Tools Menu</title>
-      <para>
-         This menu contains one item:
-
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Search for
-	    Contacts</guimenuitem></term> <listitem><para> Brings up
-	    the in-depth search window. <xref
-	    linkend="contact-search"> describes how to use this
-	    feature.  </para></listitem>
-            </varlistentry>
-        </variablelist>
-      </para>
-    </sect2>
-
-
-
-   <sect2 id="menuref-contact-actions">
-      <title>Contact Manager Tools Menu</title>
-      <para>
-         This menu contains only one item:
-
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>New Directory Server</guimenuitem></term> <listitem><para> Brings up
-	    the in-depth search window. <xref
-	    linkend="config-prefs-contact-ldap-add"> describes how to use this
-	    feature.  </para></listitem>
-            </varlistentry>
-        </variablelist>
-
-      </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="menuref-contact-editor">
-    <title>The Contact Editor Menus</title>
-    <para>
-       This window has only one menu: the file menu.
-    </para>
-   
-   <sect2 id="menuref-contact-editor-file">
-      <title>Contact Editor File Menu</title>
-      <para>
-         This menu contains five items:
-         <variablelist>
-
-	  <varlistentry>
-	  <term><guimenuitem>Save</guimenuitem></term>
-	  <listitem><para>
-             
-           </para></listitem>
-	  </varlistentry>	
-
-	  <varlistentry>
-	  <term><guimenuitem>Save As</guimenuitem></term>
-	  <listitem><para>
-              Allows you to save the contact as an external 
-              file in the <glossterm linkend="vcard">VCard</glossterm> format. 
-           </para></listitem>
-	  </varlistentry>	
-
-	  <varlistentry>
-	  <term><guimenuitem>Print</guimenuitem></term>
-	  <listitem><para>
-             Prints the current contact.
-           </para></listitem>
-	  </varlistentry>	
-
-
-	  <varlistentry>
-	  <term><guimenuitem>Delete</guimenuitem></term>
-	  <listitem><para>
-             Deletes the current contact.
-           </para></listitem>
-	  </varlistentry>	
-
-  
-	  <varlistentry>
-	  <term><guimenuitem>Close</guimenuitem></term>
-	  <listitem><para>
-              Closes the Contact Editor without saving.
-           </para></listitem>
-	  </varlistentry>	
-
-	</variablelist>  
-      </para>
-    </sect2>
-  </sect1>
-  
-
-</chapter>
-
-
-
-
-
-
-
+</appendix>
\ No newline at end of file
diff --git a/help/no/preface.sgml b/help/no/preface.sgml
index 28190668b6..839dbdcb93 100644
--- a/help/no/preface.sgml
+++ b/help/no/preface.sgml
@@ -1,130 +1,10 @@
 <!--
 <!DOCTYPE preface PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
 -->
-
   <preface id="introduction">
-<!-- =============Introduction ============================= -->
-    <title>Introduction</title> 
-
-    <sect1 id="what"> 
-      <title>What is 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>.
-        <application>Evolution</application>'s goal 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>
-        Without all the hot air, that means it's a tool to help you
-        get your work done.
-      </para>
-      <para>
-        Because it's part of the GNOME project,
-        <application>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>
-        <note>
-           <title>This is a Beta release</title>
-           <para>
-             <application>Evolution</application> is now on the home
-             stretch to version 1.0.  Please help prepare for the 1.0
-             release by reporting bugs to us at <ulink
-             url="http://bugzilla.ximian.com">bugzilla.ximian.com</ulink>. There
-             are detailed bug reporting instructions in <xref
-             linkend="evolution-faq">.
-          </para>
-          <para>
-            Please send comments on the guide to
-            <email>aaron@ximian.com</email>. The first person to send
-            some good suggestions gets a free Ximian t-shirt.
-          </para>
-        </note>
-      </para>
-
-      <para>
-        <application>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>
-        The <application>Evolution</application> project has four
-        central goals:
-
-        <itemizedlist>
-	  <listitem>
-	    <para>
-             The application must be <emphasis>both powerful and easy
-             to use</emphasis>. In other words, it needs a familiar
-             and intuitive interface that users can customize to their
-             liking, and users should have access to shortcuts for
-             complex tasks.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-              <application>Evolution</application> must meet and
-              exceed the standards set by other groupware products.
-              It must include support for major network <glossterm
-              linkend="protocol">protocols</glossterm> so that it can
-              integrate seamlessly with existing hardware and network
-              environments.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-               The project must support open standards and be open to
-               expansion, so that it can become a development platform
-               as well as an application.  From the simplest scripting
-               to the most complex network and component programming,
-               <application>Evolution</application> must offer
-               developers an environment for cutting-edge application
-               development.
-            </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Data must be safe: <application>Evolution</application>
-	    must not lose mail, corrupt mailbox files or other data,
-	    execute arbitrary <glossterm
-	    linkend="script">scripts</glossterm>, or delete files from
-	    your hard disk.
-	  </para>
-	</listitem>
-      </itemizedlist>
-    </para>
-    <para>
-      <application>Evolution</application> is designed to make most
-      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>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="aboutbook">
-      <title>About This Book</title>
+    <title>About this Book</title> 
+      <sect1 id="organization">
+        <title>Organization</title>
       <para>
         This book is divided into two parts, with several
         appendices. The first part is a <link linkend="usage">guided
@@ -135,19 +15,18 @@
         <link linkend="config">configuration</link>, is targeted at
         more advanced users, but anyone who wants to change the way
         <application>Evolution</application> looks or acts can benefit
-        from reading it.  In addition, there is a comprehensive <link
-        linkend="menuref">menu reference</link> which describes nearly
-        every capability that <application>Evolution</application> has
-        to offer.
+        from reading it.  
       </para>
-      <formalpara>
+      </sect1>
+
+      <sect1 id="typography">
         <title>Typographical conventions</title>
 	<para>
-          Some kinds of words are marked off with special typography:
+          In this book, we'll mark some words with special typography:
           <simplelist>
 	    <member><application>Applications</application></member>
-	    <member><command>Commands</command> typed at the command line</member>
-	    <member><guilabel>Labels</guilabel> for interface items</member>
+	    <member><command>Commands</command> you type at the command line</member>
+	    <member><guilabel>Labels</guilabel> for </member>
 
             <member> Menu selections look like this:
                        <menuchoice>
@@ -174,7 +53,7 @@
 	  <example>
 	    <title>Example Example</title>
 	    <para>
-	      This is what an example looks like.
+	      This is what an example looks like. 
 	    </para>
 	  </example>
 
@@ -185,311 +64,6 @@
 	      </para>
 	  </warning>
         </para>
-      </formalpara>
-  </sect1>
-
-  <sect1 id="quickref-commontasks">
-    <title>Quick Reference for Common Tasks</title>
-    <para>
-      You might want to copy this section and tape it to the wall
-      next to your computer: it's a very short summary of most of
-      the things you'll want to do with
-      <application>Evolution</application>.  Read <xref linkend="menuref"> if
-      you would like a complete list of keyboard shortcuts for menu commands.
-    </para>
-    
-    <sect2 id="quickref-newthings">
-      <title>Opening or Creating Anything</title>
-      <para>
-	
-          <variablelist>
-
-	  <varlistentry>
-	    <term>Create a new folder</term>
-	    <listitem>
-	      <para>
-                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu>
-                <guimenuitem>Folder</guimenuitem></menuchoice> or
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift </keycap>
-		  <keycap>F</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Shortcut in the Evolution Bar</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Evolution Bar Shortcut</guimenuitem> </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>S</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new email message:</term>
-	    <listitem>
-	      <para>
-                Use
-                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Mail
-                Message</guimenuitem>  </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift </keycap>
-		  <keycap>M</keycap>
-                </keycombo>
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Appointment</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Appointment</guimenuitem> </menuchoice>  or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>A</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term>Enter a new Contact</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Contact</guimenuitem> </menuchoice>  or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>C</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term>Create a new Task</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Task</guimenuitem>  </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>T</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	</variablelist>
-      </para>
-    </sect2> 
-    <sect2 id="quickref-mail">
-      <title>Mail Tasks</title>
-      <para>
-        Here are the most frequent email tasks, and shortcuts for
-        navigating your mailbox with the keyboard instead of the
-        mouse:
-         <variablelist>
-
-          <varlistentry>
-	    <term>Navigating the Message List with the Keyboard</term>
-	    <listitem>
-	      <para>
-                Press <keycap>N</keycap> to jump to the next unread
-                message. <keycap>P</keycap> goes to the previous
-                unread message.  Use the arrow keys to move up
-                and down along the list of all message.
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Display the next page of a message in the preview pane</term>
-	    <listitem>
-	      <para>
-                Press the space bar.
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Reply to a Message</term>
-	    <listitem>
-	      <para>
-                To reply to the sender of the message only:
-                click <guibutton>Reply</guibutton> in the
-                toolbar, or press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>R</keycap>
-                </keycombo>
-                </para>
-	      <para>
-                To reply to the sender and all the other visible
-                recipients of the message, click <guibutton>Reply to
-                All</guibutton> or select the message and press
-                <keycombo action="simul">
-		  <keycap>Shift</keycap>
-		  <keycap>Ctrl</keycap>
-		  <keycap>R</keycap>
-                </keycombo>
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  
-          <varlistentry>
-	    <term>Forward a Message</term>
-	    <listitem>
-	      <para>
-                Select the message or messages you want to forward,
-                and click <guibutton>Forward</guibutton> in the
-                toolbar, or press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>F</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Open a Message in a New Window</term>
-	    <listitem>
-	      <para>
-                Double-click the message you want to view, or select
-                it and press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>O</keycap>
-                </keycombo>
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  
-          <varlistentry>
-	    <term>Create Filters and Virtual Folders</term>
-	    <listitem>
-	      <para>
-                Right-click on a message and select "Create Rule..."
-                menu items. You can also create filters and virtual
-                folders in the <guimenu>Tools</guimenu> menu.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	
-      </para>
-    </sect2>
-    <sect2 id="quickref-cal">
-      <title>Address Book</title>
-      <para>
-        <variablelist>
-	  <varlistentry>
-	    <term></term>
-	    <listitem>
-	      <para>
-		<tip id="new-appt">
-		  <title>New Appointments Fast</title>
-		  <para>
-		    Double-click in a blank space to create a new contact.
-		  </para>
-		</tip>
-	      </para>
-	    </listitem>
-	    </varlistentry>
-	  </variablelist>
-
-        </para>
-  </sect2>
-    <sect2 id="quickref-contact">
-        <title>Contact Manager</title>
-        <para>
-	Here are the most frequent tasks that are done in the Contact Manager,
-	with the shortcuts so that you can use these tasks without having to use
-	your mouse:
-
-        <variablelist>
-	  <varlistentry>
-	    <term>Edit a Contact</term>
-	    <listitem>
-	      <para>
-		You can edit a contact two ways:
-		<itemizedlist>
-		  <listitem>
-		    <para>
-		      Click once on the person's address card and you can
-		      edit the person's properties all in the same window.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Double-click on the contact's card and alter their details.
-		    </para>
-		  </listitem>
-		</itemizedlist>
-               </para>
-	    </listitem>
-	    </varlistentry>
-	  </variablelist>
-	
-	<variablelist>
-	  <varlistentry>
-	    <term>Deleting a Contact</term>
-	    <listitem>
-	      <para>
-		Right click on a contact and click <guilabel>Delete</guilabel>
-		or select a contact and press the <guibutton>Delete</guibutton>
-		on the <guilabel>toolbar</guilabel>.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	
-	
-        <variablelist>
-	  <varlistentry>
-	    <term>Email a Contact</term>
-	    <listitem>
-	      <para>
-		Right click on a contact and select 
-		<guilabel>Send message to contact</guilabel>.
-               </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	
-        <variablelist>
-	  <varlistentry>
-	    <term></term>
-	    <listitem>
-	      <para>
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-
-      </para>
-    </sect2>
-  </sect1>
+    </sect1>
 </preface>
+
diff --git a/help/no/usage-calendar.sgml b/help/no/usage-calendar.sgml
index 3aeb9b23e2..41a5abd2b7 100644
--- a/help/no/usage-calendar.sgml
+++ b/help/no/usage-calendar.sgml
@@ -4,73 +4,47 @@
 
 <chapter id="usage-calendar">
   <title>Managing your Schedule</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>TaskPad</guilabel>, where you can keep a list of tasks
-    separate from your calendar appointments.  The calendar's daily
-    view is shown in <xref linkend="usage-calendar-fig">.
 
-   <!-- ============== Figure ============================= -->
-    <figure id="usage-calendar-fig">
-      <title>Evolution Calendar View</title>
-      <screenshot>
-	<screeninfo>Evolution Contact Manager Window</screeninfo>
-	<graphic fileref="figures/calendar" format="png" srccredit="Aaron Weber">
-	</graphic>
-      </screenshot>
-    </figure>
-  <!-- ============== End of Figure ============================= --> 
+     <para>
+      This chapter will show you how to use the Ximian Evolution
+      Calendar to manage your schedule alone or in conjunction with
+      others.
+<!-- Others what? -->
+     </para>
 
-  </para>
-
-  <para>
-    <inlinegraphic fileref="figures/full-1" format="png"></inlinegraphic>
-    <guilabel>Event List</guilabel>
-  </para>
-  
-  <para>
-    The <guilabel>Event List</guilabel> is responsible for showing you all of
-    your scheduled events, whether they are all day events or simply one time
-    events that last a half an hour.
-  </para>
-
-  <para>
-    <inlinegraphic fileref="figures/full-2" format="png"></inlinegraphic>
-    <guilabel>Todo List</guilabel>
-  </para>
-  
-  <para>
-    The <guilabel>Todo List</guilabel> compliments the <guilabel>Event List
-    </guilabel> as it keeps track of your chores or tasks which don't have
-    any time associated with them.  These may include "Clean Room" or "Call
-    Repairman".
-  </para>
-
-  <para>
-    <inlinegraphic fileref="figures/full-3" format="png"></inlinegraphic>
-    <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>Event
-    List</guilabel>.
-  </para>
-  
     <sect1 id ="usage-calendar-view"> 
     <title>Ways of Looking at your Calendar</title>
-
     <para>
        The toolbar offers you four different views of your calendar:
-       one day, five days, a week, or a month at once. Press the
-       calendar-shaped buttons on the right side of the toolbar to
-       switch between views. You can also select a range of
-       days&mdash; three days, ten days, a fortnight if you want
-       &mdash; in the small calendar at the upper right.
+       <itemizedlist>
+	<listitem>
+	  <para>
+	    Day
+	  </para>
+	</listitem>
+	<listitem>
+	  <para>
+	    Work Week
+	  </para>
+	</listitem>
+	<listitem>
+	  <para>
+	    Week
+	  </para>
+	</listitem>
+	<listitem>
+	  <para>
+	    Month
+	  </para>
+	</listitem>
+      </itemizedlist>
+
+      Press the calendar-shaped buttons on the right side of the toolbar to
+      switch between views. 
+<!--QUESTION What does the following mean?  I can't find this functionality -->
+      You can also select a range of
+      days&mdash; three days, ten days, or a fortnight if you want
+      &mdash; in the small calendar at the upper right.
     </para>
     <para>
        The <guibutton>Prev</guibutton> and <guibutton>Next</guibutton>
@@ -87,29 +61,17 @@
        box that appears.
     </para>
 
-
-<!-- ############### FIXME FIXME FIXME ############
-Feature not yet implemented, and may not be implemented due to
-lack of time, resources, and interest.
-    <para>
-       In addition, <application>Evolution</application> supports
-       Hebrew, Muslim, and other calendar formats.  To switch to a
-       different calendar format, choose
-       <guimenuitem>GUIMENUITEM</guimenuitem> from the
-       <guimenu>GUIMENU</guimenu>.
-    </para>
-################  END FIXME AREA   ##################   -->
-
   </sect1>
   <sect1 id="usage-calendar-apts">
     <title>Scheduling With the Evolution Calendar</title>
     <para>
       Of course, you'll want to use the calendar to do more than find
       out what day it is. This section will tell you how to schedule
-      events, set alarms, and determine event recurrence.
+      appointments, set alarms, and determine appointment recurrence.
     </para>
+
     <sect2 id="usage-calendar-apts-basic">
-      <title>Creating events</title>
+      <title>Creating appointments</title>
       <para>
 	To create a new appointment, select
         <menuchoice>
@@ -119,7 +81,7 @@ lack of time, resources, and interest.
 	</menuchoice>
 	or click the <guibutton>New</guibutton> button on the left end
 	of the toolbar. The <interface>New Appointment</interface>
-	dialog will pop up with the usual menu bar, tool bar, and
+	dialog will pop up with the menu bar, tool bar, and
 	window full of choices for you.
       </para>
       <tip id="new-appointment-shortcut">
@@ -133,22 +95,22 @@ lack of time, resources, and interest.
       </tip>
 
       <para>
-        Your event must have a starting and ending date &mdash; by
+        Your appointment must have a starting and ending date &mdash; by
         default, today &mdash; but you can choose whether to give it
         starting and ending times or to mark it as an <guilabel>All
         day event</guilabel>. An <guilabel>All day event</guilabel>
-        appears at the top of a day's event list rather than inside
-        it.  That makes it easy to have events that overlap and fit
+        appears at the top of a day's appointment list, in the grey header under the date, rather than inside
+        it.  That makes it easy to have appointments that overlap and fit
         inside each other.  For example, a conference might be an all
-        day event, and the meetings at the conference would be timed
-        events.  Of course, events with specific starting and ending
+        day appointment, and the meetings at the conference would be timed
+        appointments.  Of course, appointments with specific starting and ending
         times can also overlap.  When they do they're displayed as
         multiple columns in the day view of the calendar.
       </para>
       <note>
-       <title>Doing Two Things At Once</title>
+       <title>Multiple Simultanious Appointments</title>
          <para>
-           If you create calendar events that overlap,
+           If you create calendar appointments that overlap,
            <application>Evolution</application> will display them side
            by side in your calendar.  However,
            <application>Evolution</application> cannot help you do
@@ -157,7 +119,7 @@ lack of time, resources, and interest.
       </note>
       <para>
          You can have as many as four different
-         <guilabel>Alarms</guilabel>, any time prior to the event
+         <guilabel>Alarms</guilabel>, any time prior to the appointment
          you've scheduled.  You can have one alarm of each of the following types:
           <variablelist>
            <varlistentry>
@@ -165,7 +127,7 @@ lack of time, resources, and interest.
 	    <listitem>
 	      <para>
 	        A window will pop up on your screen to remind you of
-	        your event.
+	        your appointment.
               </para>
 	    </listitem>
 	  </varlistentry>
@@ -204,14 +166,12 @@ lack of time, resources, and interest.
       </para>
       <para>
          <guilabel>Classification</guilabel> 
-          and only applies to calendars on a
+         only applies to calendars on a
          network. <guilabel>Public</guilabel> is the default category,
-         and a public event can be viewed by anyone on the calendar
+         and a public appointment can be viewed by anyone on the calendar
          sharing network.  <guilabel>Private</guilabel> denotes one
-         level of security, and <guilabel>Confidential</guilabel> a
-         higher level.  <!-- FIXME --> Exact determinations and
-         implementations of this feature have yet to be
-         determined. <!-- FIXME -->
+         level of security, and <guilabel>Confidential</guilabel> an even 
+         higher level.
       </para>
       <para>
         <application>Evolution</application> lets you categorize your
@@ -221,10 +181,10 @@ lack of time, resources, and interest.
       </para>
       
       <tip>
-      <title>Adding a New Category</title>
+      <title>Adding a New Appointment Category</title>
 	<para>
 	 You can add a new category to your category list by clicking on
-         <guibutton>Edit Master Category List...</guibutton> and single-clicking
+         <guibutton>Edit Master Category List</guibutton> and single-clicking
 	 on <guilabel> Click here to add a category</guilabel>.
 	</para>
       </tip>
@@ -237,22 +197,22 @@ lack of time, resources, and interest.
 
       <para>
 	Clicking on the <guibutton>Categories</guibutton> button opens up the category
-	list.  To associate a category to an event, simply click the check box. 
+	list.  To associate a category to an appointment, simply click the check box. 
       </para>
       <para>
 	Once you've selected your categories, click <guibutton>OK</guibutton> to
-	assign these categories to the event.  The categories you selected are now
+	assign these categories to the appointment.  The categories you selected are now
 	listed in the text box to the right of the <guibutton>Categories...</guibutton>
 	button.
       </para>
 
       <para>
         The <guilabel>Recurrence</guilabel> tab lets you describe
-        repetition in events ranging from once every day up to once
+        repetition in appointments ranging from once every day up to once
         every 100 years.  You can then choose a time and date when the
-        event will stop recurring, and, under
+        appointment will stop recurring, and, under
         <guilabel>Exceptions</guilabel>, pick individual days when the
-        event will <emphasis>not</emphasis> recur. Make your
+        appointment will <emphasis>not</emphasis> recur. Make your
         selections from left to right, and you'll form a sentence:
         "Every two weeks on Monday and Friday until January 3, 2003"
         or "Every month on the first Friday for 12 occurrences."
@@ -260,17 +220,17 @@ lack of time, resources, and interest.
 
       <para>
 	Once you're done with all those settings, click on the disk
-	icon in the toolbar.  That will save the event and close the
-	event editor window. If you want, you can alter an event
+	icon in the toolbar to save and close the appointment editor window. 
+	If you want, you can alter an appointment
 	summary in the calendar view by clicking on it and typing. You
-	can change other settings by right-clicking on the event then
+	can change other settings by right-clicking on the appointment then
 	choosing <guimenuitem>Edit this Appointment</guimenuitem>.
       </para>
     </sect2>
     <sect2 id="usage-calendar-rsvp">
-      <title>RSVPs with the Calendar</title>
+      <title>Sending an RSVP with the Calendar</title>
       <para>
-	<application>Evolution</application> can be used to setup group events
+	<application>Evolution</application> can be used to setup group appointments
 	and help you manage RSVPs.
       </para>
       <para>
@@ -279,46 +239,125 @@ lack of time, resources, and interest.
 	easily reply to you with their response.  If they aren't sure if they
 	can attend, they can always reply to the mail later.
       </para>
+      <para>
+	To select receipients to be invited to an event:
+	<orderedlist numeration="arabic">
+	  <listitem>
+	    <para>
+	      Click
+	      <menuchoice>
+		<guimenu>Actions</guimenu>
+		<guimenuitem>Schedule Meeting</guimenuitem>
+	      </menuchoice>.  The <guilabel>Scheduling</guilabel> and <guilabel>Meeting</guilabel> tab open.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      If you have multiple identities setup, select the identity to use in the <guilabel>Sent By</guilabel> field.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click in the white box.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click <guibutton>Invite Others</guibutton>.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	    Select a person in the <guilabel>Contacts</guilabel> field and click one of the four choices to move them to be an RSVP reciever.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click <guibutton>OK</guibutton>.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Save the Appointment.
+	    </para>
+	  </listitem>
+	</orderedlist>
+	An email is now sent out to all the recipients, inviting them to your event.
+      </para>
+    </sect2>
+    <sect2 id="replying-to-rsvp">
+      <title>Replying to an RSVP</title>
+      <para>
+	If you recieve an RSVP, the RSVP will be attached as an ical file.  Click on the attachment and view it inline.   All the details are shown about the event including time and dates.  Then you can choose how to reply to the RSVP.  Your choices are:
+	<itemizedlist>
+	  <listitem>
+	    <para>
+	      Accept
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Tentativly Accept
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Decline
+	    </para>
+	  </listitem>
+	</itemizedlist>
+	Click <guibutton>OK</guibutton> and an email will be sent to the organizer with your answer.  The event will also be added to your calendar if you accept.
+      </para>
     </sect2>
-<!-- ############UNIMPLEMENTED FEATURES ###################
 
-    <sect2 id="usage-calendar-apts-group">
-      <title>Appointments for Groups</title>
+    <sect2 id="recieving-rsvp-response">
+      <title>Recieving an RSVP Response</title>
       <para>
-	If you have your calendar set up to work with other
-	calendars over a network, you can see when others are
-	available to meet with you. 
+	Once you recieve an RSVP, you'll need to view it inline in the email.  Click the attachment and select <guibutton>View Inline</guibutton>.  At the bottom, you can choose an action.  Click <guibutton>OK</guibutton> to update your attendee list.
       </para>
-      <note>
-	<title>Unimplemented Feature</title>
-	<para>This feature is not yet implemented.</para>
-      </note>
+    </sect2>
+
+<!-- ############UNIMPLEMENTED FEATURES ###################
 
+    <sect2 id="usage-calendar-apts-group">
+      <title>Appointments for Groups</title>
       <para>
-	In addition, you can use <application>Evolution</application>
-	to mark a meeting request on another person's calendar.  To do
-	it, click <guibutton>New</guibutton> in the calendar toolbar,
-	or select <menuchoice> <guimenu>File</guimenu>
+	You can use <application>Evolution</application> to mark a
+	meeting request on another person's calendar.  To do it, click
+	<guibutton>New</guibutton> in the calendar toolbar, or select
+	<menuchoice> <guimenu>File</guimenu>
 	<guisubmenu>New</guisubmenu>
 	<guimenuitem>Appointment</guimenuitem> </menuchoice> to bring
-	up the <interface>new event</interface> window.  Then describe
-	the event as you would any other.  Before you click
-	<guibutton>OK</guibutton>, (INSERT DESCRIPTION HERE...).
+	up the <interface>new appointment</interface> window.  Then
+	describe the appointment as you would any other. When you are
+	ready to send the invitation <guibutton>OK</guibutton>
 	<application>Evolution</application> will automatically send
 	email to each person on the request list, notifying of the
 	time and date of the meeting you have requested with them.  In
-	addition, it will mark the event on your calendar and on
-	theirs as tentative, rather than a confirmed, event.
+	addition, it will mark the appointment on your calendar and on
+	theirs as tentative, rather than a confirmed, appointment.
       </para>
       <para>
-	To mark a tentative event as confirmed, click once on the
-	event in the <interface>calendar view</interface> to select
-	it, and then choose <guimenuitem>Event
+	To mark a tentative appointment as confirmed, click once on the
+	appointment in the <interface>calendar view</interface> to select
+	it, and then choose <guimenuitem>Appointment
 	Properties</guimenuitem> from the <guimenu>Settings</guimenu>
-	menu.  In the <interface>Event Properties</interface> dialog
+	menu.  In the <interface>Appointment Properties</interface> dialog
 	window, click the "tentative" button to De-select the
-	event.
+	appointment.
       </para>
+      <para>
+        When your meeting attendees get the email inviting them to the
+        meeting, they'll be able to enter the information into their
+        calendars and let you know if they'll be able to attend; if
+        they use <application>Ximian Evolution</application> or
+        another iCal compliant mail client, they can do this with just
+        one click. When you get a response from them, it will include
+        an iCal attachment. Opening and accepting this attachment will
+        change the meeting data in your calendar to indicate that they
+        have responded to your invitation, and whether they will be in
+        attendance.
+     </para>
     </sect2>
 
 
@@ -342,60 +381,71 @@ lack of time, resources, and interest.
     <para>
        The Task Pad, located in the lower right corner of the
        calendar, lets you keep a list of tasks separate from your
-       calendar events.  Tasks are colored and sorted by priority and
+       calendar appointments.  Tasks are colored and sorted by priority and
        due-date (see <xref linkend="config-prefs"> for more
        information), and are included with calendar data during
-       synchronization with a hand-held device.  You can use the list
+       synchronization  with a hand-held device.  You can use the list
        in a larger format by choosing the <guibutton>Tasks</guibutton>
        button in the shortcut bar or in the folder tree.
     </para>
     <para>
        To record a new task, click the <guibutton>Add</guibutton>
-       button below the list.  <application>Evolution</application>
+       button in the toolbar.  <application>Evolution</application>
        will pop up a small window with five items in it:
      
         <variablelist>
-	  <varlistentry>
+	<varlistentry>
 	  <term> <guilabel>Summary:</guilabel></term>
 	  <listitem>
             <para>
               The description you enter here will appear in the To Do
               list itself.
-          </para>
+	    </para>
 	  </listitem>
-	  </varlistentry>
+	</varlistentry>
 	
 	<varlistentry>
 	  <term> <guilabel>Due Date:</guilabel></term>
 	  <listitem>
 	    <para>
-            Decide when this item is
-            due.  You can either type in a date and time, or select one from
-            the <guibutton>Calendar</guibutton> and time drop-down menus.
+	      Decide when this item is
+	      due.  You can either type in a date and time, or select one from
+	      the <guibutton>Calendar</guibutton> and time drop-down menus.
           </para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
-	  <term><guilabel>Priority:</guilabel></term>
+	  <term><guilabel>Start Date</guilabel></term>
 	  <listitem>
 	    <para>
-             Select a level of importance from 1 (most important) to 9
-              (least important).
-            </para>
-	  </listitem> 
+	      The date you intend to start working.  <!-- NOTE Check this please --> The item will not show up on the list until the start date.
+	    </para>
+	  </listitem>
 	</varlistentry>
 	<varlistentry>
-	  <term> <guilabel>Item Comments:</guilabel></term>
+	  <term> <guilabel>Description:</guilabel></term>
 	  <listitem>
 	    <para>
               If you wish, you can keep a more detailed description of
-              the item here.
+              the item here. For example, you can note that a task is
+              in progress, and display how close it is to completion.
             </para>
 	  </listitem>
 	</varlistentry>
+	<varlistentry>
+	  <term><guilabel>Classification</guilabel></term>
+	  <listitem>
+	    <para>
+	      Sets who will see it if your calendar is shared.
+	    </para>
+	  </listitem>
+	</varlistentry>
       </variablelist>
     </para>
     <para>
+      There are more options in the <guilabel>Details</guilabel> tab such as priority and progress settings.
+    </para>
+    <para>
        Once you've added a task to your to-do list, its summary
        appears in the <guilabel>Summary</guilabel> section of task
        list.  To view or edit a detailed description of an item,
@@ -403,6 +453,14 @@ lack of time, resources, and interest.
        <guibutton>Edit</guibutton>.  You can delete items by selecting
        them and clicking on the <guibutton>Delete</guibutton> button.
     </para>
+    <para>
+      The list of tasks is sorted in a similar way to the list of
+      email messages in <application>Ximian Evolution
+      Mail</application>.  Click once on the message headers to change
+      the direction and type of sorting, or right-click to add or
+      remove columns from the display.
+    </para>
+
   </sect1>
 
   <sect1 id="usage-calendar-multiple">
@@ -422,7 +480,7 @@ lack of time, resources, and interest.
         maintains one for the conference room, so people know when
         they can schedule meetings.  Next to that, she maintains a
         calendar that reflects when consultants are going to be on
-        site, and another that keeps track of when the Red Sox are
+        site, and another that keeps track of when the Cubs are
         playing.
       </para>
     </example>
@@ -430,22 +488,12 @@ lack of time, resources, and interest.
       To create a new calendar, select 
       <menuchoice>
 	<guimenu>File</guimenu> <guisubmenu>New</guisubmenu>
-	<guimenuitem>Calendar</guimenuitem>
+	<guimenuitem>Folder</guimenuitem>
       </menuchoice>.
-       You can place the calendar in any calendar folder and access it
+       You'll need to tell the <guilabel>New Folder</guilabel> dialog that the new folder should be of the calendar type.  You can place the calendar in any calendar folder and access it
        from the folder view.  Alarms, configuration, and display for
        each calendar are separate from each other.
     </para>
     
   </sect1>
 </chapter>
-
-
-
-
-
-
-
-
-
-
diff --git a/help/no/usage-contact.sgml b/help/no/usage-contact.sgml
index 5be3d0ca09..5a49602374 100644
--- a/help/no/usage-contact.sgml
+++ b/help/no/usage-contact.sgml
@@ -1,100 +1,34 @@
 <!--
 <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
 -->
-
 <chapter id="usage-contact">
   <title>Working with Your Contacts</title>
-  <abstract>
-    <para>
-      The <application>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>Evolution</application> than it is to change an
-      actual paper book. <application>Evolution</application> also
-      allows easy synchronization with hand-held devices.  Since
-      <application>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>Evolution</application>
-      address book is its integration with the rest of the
-      application.  When you look for someone's address, you can also
-      see a history of appointments with that person.  Or, you can
-      create address cards from emails with just a few clicks.  In
-      addition, searches and folders work in the same way they do in
-      the rest of <application>Evolution</application>.
-    </para>
-    <para>
-      This chapter will show you how to use the
-      <application>Evolution</application> address book to organize
-      any amount of contact information, share addresses over a
-      network, and several ways to save time with everyday tasks. To
-      learn about configuring the address book, see <xref
-      linkend="config-prefs-contact">.
-    </para>
-  </abstract>
-  <sect1 id="usage-contact-basic">
-    <title>Getting Started With the Address Book</title>	
-    
-    <figure id="usage-contact-fig">
-      <title>Evolution Contact Interface</title>
-      <screenshot>
-	<screeninfo>Evolution Contact List Window</screeninfo>
-	<graphic fileref="figures/contact" format="png" srccredit="Kevin Breit">
-	</graphic>
-      </screenshot>
-    </figure>
-
-    <para>
-      <inlinegraphic fileref="figures/full-1" format="png"></inlinegraphic>
-      <guilabel>Contact List</guilabel>
-    </para>
-
-    <para>
-      The <guilabel>Contact List</guilabel> lists your contacts.
-    </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>
+        This chapter will show you how to use the
+        <application>Evolution</application> address book to organize
+        any amount of contact information, share addresses over a
+        network, and several ways to save time with everyday tasks. To
+        learn about configuring the address book, see <xref
+        linkend="config-prefs-contact">.
+      </para>
 
     <para>
        The toolbar for the address book is quite simple.
        <itemizedlist>
 	<listitem><para>
-           <guibutton>New</guibutton> creates a new card.
+           Click <guibutton>New Contact</guibutton> to create a new card, or double-click 
+           in a blank space in the contact list. 
 	</para></listitem>
 
 	<listitem><para>
-           <guibutton>Find</guibutton> brings up an in-depth search window.
-         </para></listitem>
-	
-	<listitem><para>
-	    <guibutton>Print</guibutton> sends one or more of your cards to the printer.
+           Click <guibutton>New List</guibutton> to create a new card, or double-click 
+           in a blank space in the contact list. 
 	</para></listitem>
-        <listitem><para>
-           <guibutton>Delete</guibutton> deletes a selected card.
-        </para></listitem>
 
-        <listitem><para> <guibutton>View All</guibutton> displays all
-           the address information in the folder.  Use this button to
-           refresh the display for a network folder, or to switch from
-           viewing the results of a search and see all your contacts.
-	    <!-- Lets xref to search feature -->
-           </para></listitem>
+	<listitem><para> The <guiicon>printer</guiicon> icon sends one
+	    or more of your cards to the printer.  </para></listitem>
 
-        <listitem><para> <guibutton>Stop</guibutton> stops loading
+        <listitem><para> The <guiicon>stop sign</guiicon> icon stops loading
            contact data from the network.  This button is only
            relevant if you are looking at contact information on a
            network.  </para></listitem>
@@ -108,7 +42,6 @@
        more than a few people listed, you'll want some way of finding
        them more quickly, which is why there's a search feature.
     </para>
-  </sect1>
 
   <sect1 id="usage-contact-cards">
     <title>The Contact Editor</title>
@@ -138,21 +71,22 @@
     
     <para>
       The contact editor window has two tabs,
-      <guilabel>General</guilabel>, for basic contact information,
-      and <guilabel>Details</guilabel>, for a more specific
-      description of the person.  In addition, it contains a
-      <guimenu>File</guimenu> menu, (see <xref
-					       linkend="menuref-contact-editor">) and a toolbar with three
-    	items: <guilabel>Save and Close</guilabel>,
-    	<guilabel>Print</guilabel>, and <guilabel>Delete</guilabel>.
+      <guilabel>General</guilabel>, for basic contact information, and
+      <guilabel>Details</guilabel>, for a more specific description of
+      the person.  In addition, it contains a <guimenu>File</guimenu>
+      menu and a toolbar with three items: <guilabel>Save and
+      Close</guilabel>, <guilabel>Print</guilabel>, and
+      <guilabel>Delete</guilabel>.
       </para>
     
     <figure id="usage-contact-editor-fig">
       <title>Evolution Contact Editor</title>
       <screenshot>
 	<screeninfo>Evolution Contact Editor</screeninfo>
-	<graphic fileref="figures/contact-editor" format="png" srccredit="Aaron Weber">
-	</graphic>
+	<mediaobject><imageobject><imagedata
+	fileref="figures/contact-editor" format="png" srccredit="Aaron
+	Weber">
+	</imageobject></mediaobject>
       </screenshot>
     </figure>
     
@@ -246,13 +180,14 @@
 	  <term>Multiple Values for Fields</term>
             <listitem>
 	      <para>
-                If you click on the small arrow buttons next to the
-                <guilabel>Primary Email</guilabel> field, you can also
-                choose <guilabel>Email 2</guilabel> and
+                If you click on the downward pointing triangle buttons
+                next to the <guilabel>Primary Email</guilabel> field,
+                you can also choose <guilabel>Email 2</guilabel> and
                 <guilabel>Email 3</guilabel>.  Although the contact
                 editor will only display one of those at any given
-                time, <application>Evolution</application> will
-                store them all.  The arrow buttons next to the
+                time, <application>Evolution</application> will store
+                them all.  Entries that have information in them have
+                a check mark next to them.  The buttons next to the
                 telephone and postal address fields work in the same
                 way.
               </para>
@@ -427,7 +362,9 @@
          to organize your cards.  The first way is to use folders;
          this works the same way mail folders do.  For more
          flexibility, you can also mark contacts as elements of
-         different categories.
+         different categories.  To better integrate with email tools,
+         you can also create lists of contacts that you can send mail
+         to as a single person.
       </para>
 
       <sect3 id="usage-contact-organize-group-folder">
@@ -476,11 +413,6 @@
            right.  From the dialog box that appears, you can check as
            many or as few categories as you like.
         </para>
-	<para>
-           Then, you can refer to all the cards in that category by:
-           <!-- FIXME --> Waiting for Evolution to support the
-           operation.
-         </para>
 
        <!-- FIXME: Feature Not Implemented
 	<para>
@@ -494,6 +426,73 @@
        -->
 
       </sect3>
+
+      <sect3 id="usage-contact-organize-group-list">
+	<title>Creating a List of Contacts</title>
+	<para>
+           To create a list of contacts:
+
+         <orderedlist numeration="arabic">
+	    <listitem>
+	      <para>
+                Open the list creation dialog box by clicking the
+                <guibutton>New List</guibutton> button or selecting
+                 <menuchoice>
+		  <guimenu>
+                     File
+                  </guimenu>
+		  <guisubmenu>
+                      New
+                   </guisubmenu>
+		  <guimenuitem>
+                     Contact List
+                   </guimenuitem>
+		</menuchoice>.
+               </para>
+	    </listitem>
+	    
+	    <listitem>
+	      <para>
+                Enter a name for the list.
+              </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+                Enter names or email addresses of contacts, or just
+	        drag contacts from the main window into the list.
+              </para>
+	    </listitem>
+
+	    <listitem>
+	      <para>
+                 Choose whether you would like to hide the email
+                 addresses when you send a message to the list.
+                 Unless it is a very small list, it is recommended
+                 that you leave the addresses hidden.  This is the
+                 same thing as using the "Bcc:" feature discussed in
+                 <xref linkend="usage-mail-getnsend-send-to-types">.
+              </para>
+	    </listitem>
+	    
+	  </orderedlist>
+        </para>
+	<para>
+           When you are done, click <guibutton>OK</guibutton>. The
+           list will appear as a contact card, which you can use as
+           you would any other. That includes emailing the list to
+           another person, and, of course, sending email to the list.
+        </para>
+	<para>
+           To mail the list, open a new email and type the name you
+           chose for the list. Ximian Evolution will address the
+           message to the entire list when you send it. You can also
+           right-click on the list's address card in the Contact
+           Manager and select <guimenuitem>Send Message to
+           List</guimenuitem>.
+        </para>
+      </sect3>
+
+
     </sect2>
   </sect1>
   
@@ -573,18 +572,7 @@
      </para>
   </sect1>
 
-  <sect1 id="usage-contact-automate">
-    <title>Address Book Tools</title>
-    <para>
-       The address book works closely with
-       <application>Evolution</application>'s mail and calendar tools.
-       For example, you can use the address book to help you manage
-       mailing lists, and send or recieve address cards over email.
-       More tools are on the way, and when they arrive, <!-- FIXME -->
-       they will be described in this section.
-    </para>
-
-    <sect2 id="contact-automation-basic">
+    <sect1 id="contact-automation-basic">
       <title>Send me a Card: Adding New Cards Quickly</title>
       <para>
 	As noted before, when you get information about a person in
@@ -596,10 +584,10 @@
 	hand-held device during HotSync operation.  For more
 	information about that, see <xref linkend="usage-sync">.
       </para>
-    </sect2>
+    </sect1>
 
-    <sect2 id="contact-automation-lists">
-      <title>Managing a Mailing list</title>
+    <sect1 id="contact-automation-lists">
+      <title>Sending Mail to Categories of Contacts</title>
       <para>
 	 You already know that when you are writing an email, you can
 	 address it to one or more people, and that
@@ -621,9 +609,10 @@
       </para>
  -->
 
-    </sect2>
+    </sect1>
+
     <!---  FIXME this feature not yet implemented 
-  <sect2 id="usage-contact-automation-extra">
+  <sect1 id="usage-contact-automation-extra">
   <title>Map It!</title>
   <para>
     Need a map or directions? Click
@@ -635,5 +624,5 @@
     -->
     
     
-  </sect1>
+
 </chapter> 
diff --git a/help/no/usage-exec-summary.sgml b/help/no/usage-exec-summary.sgml
index 76724e4362..be59cb389d 100644
--- a/help/no/usage-exec-summary.sgml
+++ b/help/no/usage-exec-summary.sgml
@@ -1,187 +1,312 @@
-<chapter id="usage-exec-summary">
-   <title>My Evolution</title>
+<!--
+<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
+-->
+<chapter id="usage-summary">
+  <title>Using the Ximian Evolution Summary</title>
+  
+  <sect1 id="summary-intro">
+    <title>Introducing the Summary</title>
     <para>
-       My Evolution is designed to show you a
-       summary of important information: the appointments for a given
-       day, important email, and so forth. To see your My Evolution, 
-       click on the <guibutton>My Evolution</guibutton>
-       button in the shortcut bar, or select the
-       <guilabel>My Evolution</guilabel> folder in the folder
-       bar.
+      The Ximian Evolution Summary can show you what you need to know
+      quickly.  It will show you your tasks for that day, how many
+      emails are waiting for you, and much more.
+    </para>
+    <para>
+      To begin using your Summary, click on the <guilabel>Shortcut
+      Bar</guilabel> or <guilabel>Summary</guilabel> at the top of the
+      <guilabel>Folder Bar</guilabel>.  By default, you will see:
+      <itemizedlist>
+	<listitem>
+	  <para>
+	    Weather Reports
+	  </para>
+	</listitem>
+	<listitem>
+	  <para>
+	    News feeds from the Internet
+	  </para>
+	</listitem>
+	<listitem>
+	  <para>
+	    Your mail summary, showing you how many new emails are
+	    waiting in selected mail boxes.
+	  </para>
+	</listitem>
+	<listitem>
+	  <para>
+	    Appointments
+	  </para>
+	</listitem>
+	<listitem>
+	  <para>
+	    Tasks
+	  </para>
+	</listitem>
+      </itemizedlist>
+    </para>
+  </sect1>
+  <sect1 id="customizing-summary">
+    <title>Customizing the Summary's Modules</title>
+    <para>
+      <application>Evolution's</application> modules can be customized
+      to suit your needs.  For example, you can choose which mail
+      boxes are summarized, and which news services appear.
     </para>
 
-    <sect1 id="exec-intro">
-      <title>Introducing My Evolution</title>
-      <para>
-        The first thing you'll want to do with My Evolution
-        is add a service. Go to
-      <menuchoice>
-	<guimenu>Tools</guimenu>
-	<guimenuitem>My Evolution Settings</guimenuitem>
-      </menuchoice>
-      then select one of the available
-      services.  Services may vary depending upon your system, but
-      most installations will have at least the following options:
-      <variablelist>
 
-	<varlistentry>
-	  <term>Mail</term>
+  <note id="summary-http-proxy">
+	<title>Using the Summary through an HTTP Proxy</title>
+        <para>
+           If you use an HTTP proxy, <application>Ximian
+           Evolution</application> must be able to find it through the
+           <systemitem>gnome-vfs</systemitem> subsystem before it can
+           access news and weather from the Internet.  This is also
+           the case if you wish to load remote images into HTML mail
+           message.  You can tell the GNOME Virtual File System about
+           your HTTP proxy in one of two ways:
+            <variablelist>
+	    <varlistentry>
+	      <term>Configure it with Nautilus</term>
+	      <listitem>
+		<para>
+                 <orderedlist numeration="arabic">
+		    <listitem>
+		      <para>
+			Open a Nautilus window
+	               </para>
+		    </listitem>
+      		    <listitem>
+		      <para>
+	                 Select <menuchoice>
+			  <guimenu>Preferences</guimenu>
+			  <guimenuitem>Edit Preferences</guimenuitem>
+			</menuchoice>.
+	               </para>
+		    </listitem>
+      		    <listitem>
+		      <para>
+			Go to the <guilabel>Navigation</guilabel> tab.
+	               </para>
+		    </listitem>
+      		    <listitem>
+		      <para>
+			Click the <guilabel>Use HTTP Proxy</guilabel>
+			checkbox and enter the location of your HTTP
+			proxy in the <guilabel>Location</guilabel> field.
+	               </para>
+		    </listitem>
+		  </orderedlist>
+                </para>
+	      </listitem>
+	    </varlistentry>
+	    <varlistentry>
+	      <term>Configure it with the gconftool command</term>
+	      <listitem>
+	      <para>
+                 <orderedlist numeration="arabic">
+		    <listitem>
+		      <para>
+                        Open a terminal.
+                      </para>
+		    </listitem>
+		    <listitem>
+		      <para>
+                        Enter the command 
+                        <command>
+                        gconftool --type=bool --set /system/gnome-vfs/use-http-proxy "TRUE"
+                        </command>
+                      </para>
+		    </listitem>
+		    <listitem>
+		      <para>
+                        Enter the command 
+                        <command>
+      gconftool --type=string --set /system/gnome-vfs/http-proxy-host "your-proxy-url"
+                        </command>
+                      </para>
+		    </listitem>
+		    <listitem>
+		      <para>
+                        Enter the command 
+                        <command>
+                        gconftool --type=int --set /system/gnome-vfs/http-proxy-port "8080"
+                        </command>                  
+                      </para>
+		    </listitem>
+		  </orderedlist>
+                </para>
+		<para>
+                  For more information about the gconftool command,
+                  read the gconftool man page.
+                </para>
+	      </listitem>
+	    </varlistentry>
+	  </variablelist>
+         </para>
+      </note>
+
+
+    <sect2 id="customizing-summary-weather">
+      <title>Customizing the Weather Summary</title>
+      <para>
+	To add a city to be displayed in the weather:
+	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
-	      Display amount of unread email in your selected folders.
+	      Click <guilabel>Summary</guilabel> in the <guilabel>Shortcut Bar</guilabel>.
 	    </para>
 	  </listitem>
-	</varlistentry>
-
-          <varlistentry>
-             <term>RDF Summary</term>
-             <listitem>
-               <para>
-                  News headlines from sites that allow this
-                  feature.  The default
-                  is news about the GNOME project from <ulink
-                  url="www.gnome.org/gnome-news/">gnotices</ulink>.
-               </para>
-             </listitem>
-           </varlistentry>
-
-	<varlistentry>
-	  <term>Weather</term>
 	  <listitem>
 	    <para>
-	      Shows you the current weather for the cities of your choice.
+	      Click
+	      <menuchoice>
+		<guimenu>Tools</guimenu>
+		<guimenuitem>Summary Settings</guimenuitem>
+	      </menuchoice>.
 	    </para>
 	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term>Schedule</term>
 	  <listitem>
 	    <para>
-	      Lets you see the events for the day.
+	      Click the <guilabel>Weather</guilabel> tab.
 	    </para>
 	  </listitem>
-	</varlistentry>
-      </variablelist>
-    </para>
-    <para>
-      <application>Evolution</application> comes with ... enabled by
-      default.
-    </para>
-    <sect2 id="new-components">
-      <title>Adding New Components</title>
+	  <listitem>
+	    <para>
+	      Select the city on the left hand column.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click the <guibutton>Add</guibutton> button.
+	    </para>
+	  </listitem>
+	</orderedlist>
+	<tip id="measurments">
+	  <title>Metric or Imperial?</title>
+	  <para>
+	    <application>Evolution</application> supports both
+	    Imperial and Metric measurement for weather reports.
+	  </para>
+	</tip>
+      </para>
+    </sect2>
+    <sect2 id="customizing-feeds">
+      <title>Customizing Your News Feeds</title>
       <para>
-	To add a new service:
+	To customize your news feeds:
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
-	      Choose
+	      Click <guilabel>Summary</guilabel> in the <guilabel>Shortcut Bar</guilabel>.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click
 	      <menuchoice>
 		<guimenu>Tools</guimenu>
-		<guimenuitem>My Evolution Settings</guimenuitem>
-	      </menuchoice>
-	      from the menubar.
+		<guimenuitem>Summary Settings</guimenuitem>
+	      </menuchoice>.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Select the service you wish to add by clicking on the respective
-	      tab.
+	      Click the <guilabel>News Feeds</guilabel> tab.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Choose <guibutton>OK</guibutton> when finished configuring the
-	      item.
+	      Select the news news feed on the left column.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click the <guibutton>Add</guibutton> button.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click <guibutton>OK</guibutton>.
 	    </para>
 	  </listitem>
 	</orderedlist>
       </para>
     </sect2>
-    <sect2 id="delete-components">
-      <title>Deleting Components</title>
+    <sect2 id="customizing-mail">
+      <title>Customizing Your Mail Summary</title>
       <para>
-	To remove a service from My Evolution, do the following:
+	To customize your mail summary:
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
-	      Choose
+	      Click <guilabel>Summary</guilabel> in the <guilabel>Shortcut Bar</guilabel>.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click
 	      <menuchoice>
 		<guimenu>Tools</guimenu>
-		<guimenuitem>My Evolution Settings</guimenuitem>
-	      </menuchoice>
-	      from the menubar.
+		<guimenuitem>Summary Settings</guimenuitem>
+	      </menuchoice>.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click the <guibutton>Mail</guibutton> tab.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Select the mail folder you want to see in the preview on the left.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Click the <guilabel>Enable</guilabel> button in the component you
-	      would like to disable.
-	      <!-- This is incorrect.  I am going to ask Iain if he could throw
-	      in an Enable button -->
+	      Click <guibutton>Add</guibutton>.
 	    </para>
 	  </listitem>
 	</orderedlist>
       </para>
     </sect2>
-    <sect2 id="modifying-components">
-      <title>Modifying Components</title>
+    <sect2 id="customizing-cal">
+      <title>Customizing Your Schedule Summary</title>
       <para>
-	Chances are, the components that you setup aren't going to be setup for
-	your needs.  For instance, you may choose that you want to use different
-	city choices than the default settings.
-	<application>Evolution</application> lets you configure all the
-	components in My Evolution.
+	To customize your calendar summary:
+	<orderedlist numeration="arabic">
+	  <listitem>
+	    <para>
+	      Click <guilabel>Summary</guilabel> in the <guilabel>Shortcut Bar</guilabel>.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click
+	      <menuchoice>
+		<guimenu>Tools</guimenu>
+		<guimenuitem>Summary Settings</guimenuitem>
+	      </menuchoice>.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click the <guibutton>Schedule</guibutton> tab.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Choose whether you'd like appointments displayed for one
+	      day, five days, a week, or a month.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+            Choose whether you'd like to display all tasks, or just
+            the tasks due today.
+	    </para>
+	  </listitem>
+	</orderedlist>
       </para>
-      <sect3 id="modifying-components-mail">
-	<title>Customizing My Evolution Mail Summary</title>
-	<para>
-	  To modify mail:
-	  <orderedlist numeration="arabic">
-	    <listitem>
-	      <para>
-		Choose
-		<menuchoice>
-		  <guimenu>Tools</guimenu>
-		  <guimenuitem>My Evolution Settings</guimenuitem>
-		</menuchoice>
-		from the menubar.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Click the <guilabel>Mail</guilabel> tab at the top of the
-		window.
-	      </para>
-	    </listitem>
-	  </orderedlist>
-	</para>
-	<para>
-	  The <guilabel>Mail</guilabel> service window is broken up into two
-	  sections.  The left section is where your mail folders are listed.
-	  The right section shows which folders are displayed.
-	</para>
-	<para>
-	  To add a folder to the summary, click on a folder in the
-	  <guilabel>All folders</guilabel> section and click the
-	  <guibutton>Add</guibutton> button.
-	</para>
-	<para>
-	  To remove a folder from the service, click on the folder in the
-	  <guilabel>Display folders</guilabel> section and click the
-	  <guibutton>Remove</guibutton> button.
-	</para>
-      </sect3>
     </sect2>
   </sect1>
-</chapter>
-
-
-
-
-
-
-
-
-
-
+</chapter>
\ No newline at end of file
diff --git a/help/no/usage-mail-org.sgml b/help/no/usage-mail-org.sgml
index ece659c27a..746beed0b0 100644
--- a/help/no/usage-mail-org.sgml
+++ b/help/no/usage-mail-org.sgml
@@ -5,7 +5,7 @@
       want to sort and organize them.  When you get a hundred a day
       and you want to refer to a message you received six weeks ago,
       you <emphasis>need</emphasis> to sort and organize them.
-      Fortunately, <application>Evolution</application> has the tools
+      Fortunately, <application>Ximian Evolution</application> has the tools
       to help you do it.
     </para>
 
@@ -43,8 +43,7 @@
       <para>
 	Right-click on one of the column headers to get a list of
 	options:
-	<variablelist>
-	  
+	<variablelist>	  
 	<varlistentry>
 	  <term><guimenuitem>Sort Ascending</guimenuitem></term>
 	  <listitem><para>
@@ -93,7 +92,7 @@
     <sect1 id="usage-mail-organize-folders">
       <title>Getting Organized with Folders</title>
       <para>
-	<application>Evolution</application> keeps mail, as well as
+	<application>Ximian Evolution</application> keeps mail, as well as
 	address cards and calendars, in folders.  You start out with a
 	few, like <guilabel>Inbox</guilabel>,
 	<guilabel>Outbox</guilabel>, and <guilabel>Drafts</guilabel>,
@@ -101,7 +100,7 @@
 	selecting <guisubmenu>New</guisubmenu> and then
 	<guimenuitem>Folder</guimenuitem> from the
 	<guimenu>File</guimenu> menu.
-	<application>Evolution</application> will as you for the name
+	<application>Ximian Evolution</application> will as you for the name
 	and the type of the folder, and will provide you with a folder
 	tree so you can pick where it goes.
       </para>
@@ -123,7 +122,7 @@
       <title>Searching for Messages</title>
       <para>
 	Most mail clients can search through your messages for you,
-	but <application>Evolution</application> does it faster. You
+	but <application>Ximian Evolution</application> does it faster. You
 	can search through just the message subjects, just the message
 	body, or both body and subject.
       </para>
@@ -183,14 +182,14 @@
 	</variablelist>
 
         When you've entered your search phrase, press
-        <keycap>Enter</keycap>.  <application>Evolution</application>
+        <keycap>Enter</keycap>.  <application>Ximian Evolution</application>
         will show your search results in the message list.
       </para>
 
       <para>
          If you think you'll want to return to a search again, you can
          save it as a virtual folder by selecting <guilabel>Store
-         Search as Virtual Folder</guilabel>.
+         Search as vFolder</guilabel>.
       </para>
 
       <para>
@@ -216,7 +215,7 @@
 
      <para>
         You'll see a similar approach to sorting messages when you
-        create filters and virtual folders in the next few sections.
+        create filters and vFolders in the next few sections.
      </para>
 
     </sect1>
@@ -290,7 +289,7 @@
 		  <para>
 		    Expression - For programmers only: match a message according to an
 		    expression you write in the Scheme language, used to
-		    define filters in <application>Evolution</application>.
+		    define filters in <application>Ximian Evolution</application>.
 		  </para>
 		</listitem>
 		
@@ -302,7 +301,7 @@
 		    message's time-stamp to the system clock when the filter
 		    is run, or to a specific time and date you choose from a
 		    calendar.  You can even have it look for messages within a
-		    range of time relative to the filter &mdash perhaps you're
+		    range of time relative to the filter &mdash; perhaps you're
 		    looking for messages less than two days old.
 		  </para></listitem>
 		
@@ -367,7 +366,7 @@
 	  <listitem>
 	    <para>
 	      Select the criterion for the condition.   If you want multiple
-	      criterion for this filter, press <guibutton>Add
+	      criteria for this filter, press <guibutton>Add
 		criterion</guibutton> and repeat the previous step.
 	    </para>
 	  </listitem>
@@ -377,14 +376,14 @@
 	      section.  You can select any of the following options.
 	      <itemizedlist>
 		<listitem><para>
-		    Move to Folder - If you select this item, <application>Evolution</application>
+		    Move to Folder - If you select this item, <application>Ximian Evolution</application>
 		    will put the messages into a folder you specify.  Click the 
 		    <guibutton>&lt;click here to select a folder&gt;</guibutton> button
 		    to select a folder. 
 		  </para></listitem>
 
 		<listitem><para>
-		    Copy to Folder - If you select this item, <application>Evolution</application>
+		    Copy to Folder - If you select this item, <application>Ximian Evolution</application>
 		    will put the messages into a folder you specify.  Click the 
 		    <guibutton>&lt;click here to select a folder&gt;</guibutton> button
 		    to select a folder. 
@@ -408,7 +407,7 @@
 		  </para></listitem>
 		
 		<listitem><para>
-		    Assign Color - Select this item, and <application>Evolution</application>
+		    Assign Color - Select this item, and <application>Ximian Evolution</application>
 		    will mark the message with whatever color you please.
 		  </para></listitem>
 		
@@ -434,7 +433,57 @@
 	  </listitem>
 	</orderedlist>
       </para>
+      <example id="filter-example">
+         <title>Using a Filter to Avoid Spam</title>
+         <para>
+           The majority of bulk mail is tagged with the
+           <computeroutput>Precedence: Bulk</computeroutput> header at
+           one point or another.  Some of these messages, of course,
+           could be in mailing lists you've subscribed to, but many of
+           them are unsolicited commercial email.  
+         </para>
+         <para>
+           To catch them and put them all in one place, create a
+           new filter for incoming mail. Then:
+            <orderedlist>
+             <listitem><para>
+               Set the first part of your search critera to look in a <guilabel>Specific header</guilabel>.
+             </para></listitem>
+
+             <listitem><para>
+               Enter <userinput>Precedence</userinput> as the name of the header.
+             </para></listitem>
+
+             <listitem><para>
+               Choose <guilabel>contains</guilabel> at the second drop-down box.
+             </para></listitem>
+
+             <listitem><para>
+               Enter <userinput>Bulk</userinput> as the content to search for. 
+               You're now working with all email that has the word "Bulk" in the 
+               "Precedence" header.
+             </para></listitem>
+
+             <listitem><para>
+               For actions, select "Move to Folder" and choose the
+               folder where you'd like to place bulk mail.
+             </para></listitem>
+
+             <listitem><para>
+               If you like, add an action and choose <guilabel>Stop
+               Processing</guilabel> if you'd like this message to be
+               ignored by all other filters.
+             </para></listitem>
+
+             <listitem><para>
+                Click OK. You're done.
+    	     </para></listitem>
+	   </orderedlist>
+	 </para>
+      </example>
     </sect2>
+
+
     
     <sect2 id="filters-edit">
       <title>Editing Filters</title>
@@ -516,33 +565,33 @@
   </sect1>
     
     <sect1 id="usage-mail-organize-vfolders">
-      <title>Getting Really Organized with Virtual Folders</title>
+      <title>Getting Really Organized with vFolders</title>
       <para>
 	If filters aren't flexible enough for you, or you find
 	yourself performing the same search again and again, consider
-	a virtual folder. Virtual folders, or vFolders, are an
-	advanced way of viewing your email messages within
-	<application>Evolution</application>.  If you get a lot of
-	mail or often forget where you put messages, virtual folders can help
-	you stay on top of things.
+	a vFolder. vFolders, or virtual folders, are an advanced way
+	of viewing your email messages within
+	<application>Ximian Evolution</application>.  If you get a lot of
+	mail or often forget where you put messages, vFolders
+	can help you stay on top of things.
       </para>
       <para>
-	A virtual folder is really a hybrid of all the other organizational
+	A vFolder is really a hybrid of all the other organizational
 	tools: it looks like a folder, it acts like a search, and you
 	set it up like a filter.  In other words, while a conventional
-	folder actually contains messages, a virtual folder is a view of
+	folder actually contains messages, a vFolder is a view of
 	messages that may be in several different folders.  The
 	messages it contains are determined on the fly using a set of
 	criteria you choose in advance.
       </para>
 
       <para>
-	As messages that meet the virtual folder criteria arrive or are
-	deleted, <application>Evolution</application> will
+	As messages that meet the vFolder criteria arrive or are
+	deleted, <application>Ximian Evolution</application> will
 	automatically place them in and remove them from the
-	virtual folder contents list.  When you delete a message, it gets
+	vFolder contents list.  When you delete a message, it gets
 	erased from the folder in which it actually exists, as well as
-	any virtual folders which display it.
+	any vFolders which display it.
       </para>
 
       <para>
@@ -551,7 +600,7 @@
 	changing groups of faculty, staff, administrators and
 	students.  The more mail you need to organize, the less you
 	can afford the sort of confusion that stems from an
-	organizational system that's not flexible enough.  Virtual folders
+	organizational system that's not flexible enough.  vFolders
 	make for better organization because they can accept
 	overlapping groups in a way that regular folders and filing
 	systems can't.
@@ -559,44 +608,44 @@
 
 
     <note id="unmatched-vfolder">
-      <title>The Unmatched Virtual Folder</title>
+      <title>The Unmatched vFolder</title>
       <para>
-	Obveously, not all messages will fit into all your Virtual
-	Folders.  That's why <application>Evolution</application>
-	includes an UNMATCHED Virtual Folder.  The UNMATCHED Virtual
-	Folder displays messages that are not matched by other rules.
+	Obviously, not all messages will fit into all your Virtual
+	Folders.  That's why <application>Ximian Evolution</application>
+	includes an UNMATCHED vFolder.  The UNMATCHED 
+	vFolder displays messages that are not matched by other rules.
       </para>
     </note>
 
 
     <example id="usage-mail-organize-vFolders-ex">
-      <title>Using Folders, Searches, and Virtual Folders</title>
+      <title>Using Folders, Searches, and vFolders</title>
       <para>
 	To organize his mailbox, Jim sets up a virtual volder for emails from
 	his friend and co-worker Anna.  He has another one for messages that
-	have ximian.com in the address and <application>Evolution</application> in the subject line, so he
+	have ximian.com in the address and <application>Ximian Evolution</application> in the subject line, so he
 	can keep a record of what people from work send him about
 	<application>evolution</application>.  If Anna sends him a message about
-	anything other than <application>Evolution</application>, it only shows up in the "Anna" folder.
+	anything other than <application>Ximian Evolution</application>, it only shows up in the "Anna" folder.
 	When Anna sends him mail about the user interface for
 	<application>evolution</application>, he can see that message both in
-	the "Anna" virtual folder and in the "Internal Evolution Discussion"
-	virtual folder.
+	the "Anna" vFolder and in the "Internal Evolution Discussion"
+	vFolder.
        </para>
       </example>
 
-	<!--  (INSERT SCREENSHOT HERE: virtual folders in action) -->
+	<!--  (INSERT SCREENSHOT HERE: vFolders in action) -->
 
     <sect2 id="vfolder-create">
-      <title>Creating Virtual Folders</title>
+      <title>Creating vFolders</title>
       <para>
-	To create a virtual folder:
+	To create a vFolder:
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
 	    <menuchoice>
 	      <guimenu>Tools</guimenu>
-	      <guimenuitem>Virtual Folder Editor</guimenuitem>
+	      <guimenuitem>vFolder Editor</guimenuitem>
 	    </menuchoice>
 	    </para>
 	  </listitem>
@@ -607,7 +656,7 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Name your virtual folder in the <guilabel>Rule name</guilabel> field.
+	      Name your vFolder in the <guilabel>Rule name</guilabel> field.
 
 	    </para>
 	  </listitem>
@@ -631,7 +680,7 @@
 		  </para></listitem>
 		
 		<listitem><para>
-		    Specific Header - The virtual folder can look at any header you
+		    Specific Header - The vFolder can look at any header you
 		    want, even obscure or custom ones. Enter the header name
 		    in the first text box, and put your search text in the
 		    second one.
@@ -645,7 +694,7 @@
 		  <para>
 		    Expression - For programmers only: match a message according to an
 		    expression you write in the Scheme language, used to
-		    define virtual folders in <application>Evolution</application>.
+		    define vFolders in <application>Ximian Evolution</application>.
 		  </para>
 		</listitem>
 		
@@ -653,11 +702,11 @@
 		    which they were sent: First, choose the conditions you
 		    want a message to meet &mdash; <guilabel>before</guilabel>
 		    a given time, <guilabel>after</guilabel> it, and so forth.
-		    Then, choose the time. The virtual folder will compare the
+		    Then, choose the time. The vFolder will compare the
 		    message's time-stamp to the system clock when the filter
 		    is run, or to a specific time and date you choose from a
 		    calendar.  You can even have it look for messages within a
-		    range of time relative to the filter &mdash perhaps you're
+		    range of time relative to the filter &mdash; perhaps you're
 		    looking for messages less than two days old.
 		  </para></listitem>
 		
@@ -669,9 +718,9 @@
 		
 		<listitem><para>
 		    Score - Emails have a standard priority range from -3 (least
-		    important) to 3 (most important). You can have virtual folders set the
+		    important) to 3 (most important). You can have vFolders set the
 		    priority of messages you recieve, and then have other
-		    virtual folders 
+		    vFolders 
 		    applied only to those messages which have a certain priority.
 		  </para></listitem>
 		
@@ -690,7 +739,7 @@
 		
 		<listitem>
 		  <para>
-		    Attachments - Create a virtual folder based on  whether or not you have an
+		    Attachments - Create a vFolder based on  whether or not you have an
 		    attachment in the email.
 		  </para>
 		</listitem>
@@ -703,14 +752,6 @@
 		
 		<listitem>
 		  <para>
-		    Regex Match - If you know your way around a <glossterm
-									   linkend="regular-expression">regex</glossterm>, or
-		    regular expression, put your knowledge to use here.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
 		    Source Account - Search messages according the server you got them from.
 		    You can enter a URL or choose one from the drop-down
 		    list.  This ability is only relevant if you use more
@@ -763,11 +804,13 @@
     </orderedlist>
 
       <figure id="usage-mail-vfolder-fig-createrule">
-	<title>Selecting a Virtual Folder Rule</title>
+	<title>Selecting a vFolder Rule</title>
 	<screenshot>
-	  <screeninfo>Creating a Virtual Folder Rule</screeninfo>
-	  <graphic fileref="figures/vfolder-createrule-fig" format="png" srccredit="Aaron Weber">
-	  </graphic>
+	  <screeninfo>Creating a vFolder Rule</screeninfo>
+	  <mediaobject><imageobject><imagedata
+	  fileref="figures/vfolder-createrule-fig" format="png"
+	  srccredit="Aaron Weber">
+	  </imageobject></mediaobject>
 	</screenshot>
       </figure>
       </para>
@@ -777,7 +820,7 @@
     <sect1 id="usage-mail-subscriptions">
       <title>Subscription Management</title>
       <para>
-         <application>Evolution</application> lets you handle your
+         <application>Ximian Evolution</application> lets you handle your
          IMAP and newsgroup subscriptions with the same tool: the
          subscriptions manager.  To start using it, choose
          <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Manage
diff --git a/help/no/usage-mail.sgml b/help/no/usage-mail.sgml
index b3579fb5d8..b78a9edcb4 100644
--- a/help/no/usage-mail.sgml
+++ b/help/no/usage-mail.sgml
@@ -1,144 +1,47 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
+
 <chapter id="usage-mail">
   <title>Using Evolution for Email</title>
-  <abstract>
-    <title> A Guide to the Evolution Mailer</title>
-    <para>
-       <application>Evolution</application> email is like other email
-       programs in all the ways that matter:
-     <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
-           <systemitem><filename>mbox</filename></systemitem> and
-           <systemitem><filename>mh</filename></systemitem> files, and
-           even NNTP messages (newsgroups), which aren't technically
-           email.
-         </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Lets you enhance your security with encryption.
-	  </para>
-	</listitem>
-     </itemizedlist>
-    </para>
+  <para>
+    This chapter, and <xref linkend="usage-mail-organize">, will
+      provide you with an in-depth guide to the capabilities of
+      Evolution as a mail client.  For information about how to set up
+      your mail account, see <xref linkend="config-prefs-mail">.
+  </para>
+  
+  <note>
+    <title>If you use IMAP Mail</title>
     <para>
-      However, <application>Evolution</application> has some important
-      differences.  First, it's built to handle very large amounts of
-      mail without slowing down or crashing.  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 gargantuan volumes of
-      mail. There's also the <application>Evolution</application>
-      <link linkend="usage-mail-organize-vFolders">Virtual
-      Folder</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.
+      If you chose IMAP mail during the setup process, you must
+      subscribe to your mail folders before you can read mail in
+      them. Read <xref linkend="usage-mail-subscriptions"> to find out
+      how.
     </para>
-  </abstract>
-
+  </note>
+  
+  
   <sect1 id="usage-mail-getnsend-read">
-      <title>Reading Mail</title>
-      <para>
-       You can start reading email by clicking
-       <guibutton>Inbox</guibutton> in the shortcut bar. The first
-       time you use <application>Evolution</application>, it will
-       start with the <interface>Inbox</interface> open and show you a
-       message from Ximian welcoming you to the application.
-      </para>
-
-      <para>
-        Your <application>Evolution</application>
-        <guilabel>Inbox</guilabel> will look something like the one in
-        <xref linkend="usage-mail-intro-fig">.
-        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>
-
- <!-- ==============Figure=================================== -->
-
-      <figure id="usage-mail-intro-fig">
-          <title>Evolution Mail</title>
-          <screenshot>
-            <screeninfo>Inbox</screeninfo>
-            <graphic fileref="figures/mail-inbox" format="png" srccredit="Kevin Breit">
-        </graphic>
-        </screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-    <para>
-      <inlinegraphic fileref="figures/full-1" format="png"></inlinegraphic>
-      <guilabel>Email Viewer</guilabel>
-    </para>
-    
+    <title>Reading Mail</title>    
     <para>
-      This is where your email is displayed.
+      Start the mail client by clicking on the
+      <guibutton>Inbox</guibutton> icon in the shortcut bar, or by
+      selecting a mail folder in the folder bar.  To read a message,
+      select it in the message list; if you'd like to see it in its
+      own window, double-click on it or press
+      <keycombo action="simul">
+	<keycap>Ctrl</keycap>
+	<keycap>O</keycap>
+      </keycombo>.
     </para>
 
-    <para>
-      <inlinegraphic fileref="figures/full-2" format="png"></inlinegraphic>
-      <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>
-      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.
-      
-      <tip id="view-headers">
-	<title>Email Headers</title>
+      <tip id="spaceandbs">
+	<title>Reading Mail with the Keyboard</title>
 	<para>
-	  To look at the complete headers for email messages, select
-	  <menuchoice><guimenu>View</guimenu><guisubmenu>Message
-	  Display</guisubmenu><guimenuitem>Show Full
-	  Headers</guimenuitem></menuchoice>. To see absolutely every
-	  bit, choose
-	  <menuchoice><guimenu>View</guimenu><guisubmenu>Message
-	  Display</guisubmenu><guimenuitem>Show Email Source
-	  </guimenuitem></menuchoice>.
-       </para>
+	  You can click the spacebar to page down while you're reading
+	  an email, and press backspace to page up in an email.  This
+	  may help to make reading your email faster.
+	</para>
       </tip>
 
-    </para>
-    
     <sect2 id="usage-mail-listorder">
       <title>Sorting the message list</title>
       <para>
@@ -157,6 +60,21 @@
 	instructions on how to customize your message display
 	columns in <xref linkend="usage-mail-organize-columns">.
       </para>
+
+      <tip id="view-headers">
+	<title>Email Headers</title>
+	<para>
+	  To look at the complete headers for email messages, select
+	  <menuchoice><guimenu>View</guimenu><guisubmenu>Message
+	  Display</guisubmenu><guimenuitem>Show Full
+	  Headers</guimenuitem></menuchoice>. To see absolutely every
+	  bit, choose
+	  <menuchoice><guimenu>View</guimenu><guisubmenu>Message
+	  Display</guisubmenu><guimenuitem>Show Email Source
+	  </guimenuitem></menuchoice>.
+       </para>
+      </tip>
+
       <para>
 	You can also choose a threaded message view. Select
 	<menuchoice> 
@@ -168,6 +86,15 @@
 	message with the original, so you can follow the thread of a
 	conversation from one message to the next.
       </para>
+<figure>
+        <title>Threaded Mail View</title>
+<screenshot>
+<screeninfo>Threaded Mail View</screeninfo>
+<mediaobject><imageobject><imagedata  format="png" fileref="figures/mail-threaded" srccredit="Aaron Weber">
+</imageobject></mediaobject>
+</screenshot>
+</figure>
+
     </sect2>
     
     <sect2 id="usage-mail-getnsend-delete">
@@ -188,13 +115,22 @@
 	      choose <guilabel>Delete</guilabel>.
 	    </para>
 	    <note>
-	      <title>Deleted but still here?</title>
+	      <title>Why do I still see deleted mail?</title>
 	      <para>
-		When you do this, your message is marked to be
-		deleted.  Your email is not gone until you have
-		expunged it. When you "Expunge" a folder, you remove
-		all the mail that you have marked for deletion.
+		When you press <guibutton>Delete</guibutton> or click
+		the trash button, your mail isn't actually deleted,
+		but is marked for deletion.  Your email is not gone
+		until you have expunged it. When you "Expunge" a
+		folder, you remove all the mail that you have marked
+		for deletion.
 	      </para>
+              <para>
+                 If you don't like this behavior, select
+                 <menuchoice><guimenu>View</guimenu><guimenuitem>Hide
+                 Deleted Messages</guimenuitem></menuchoice>. Then,
+                 you will only see deleted messages when you look in
+                 your <guilabel>Trash</guilabel> folder.
+              </para>
 	    </note>
 	  </listitem>
 	  <listitem>
@@ -214,11 +150,11 @@
 	</orderedlist>
       </para>
       <note>
-	<title>Trash is Actually a Virtual Folder?</title>
+	<title>Trash is Actually a vFolder?</title>
 	<para>
-	  Your trash bin is actually a Virtual Folder that displays
-          all messages you have marked for later deletion.  For more
-          information about Virtual Folders, see <xref
+	  Your trash folder is actually a vFolder that displays all
+          messages you have marked for later deletion.  For more
+          information about vFolders, see <xref
           linkend="usage-mail-organize-vfolders">.  If you choose
           <menuchoice> <guimenu>Actions</guimenu> <guimenuitem>Empty
           Trash</guimenuitem> </menuchoice> you will expunge
@@ -264,7 +200,7 @@
   </sect1>
 
   <sect1 id="usage-mail-getnsend-get">
-    <title>Checking Mail</title>
+    <title>Checking for New Mail</title>
     <para>
       Now that you've had a look around the
       <interface>Inbox</interface>, it's time to check for new mail.
@@ -303,15 +239,60 @@
     <note id="badmailsettings">
       <title>Can't Check Mail?</title>
       <para>
-	If you get an error message instead of mail, you probably need to check
-	your network settings.  To learn how to do that,
-	 have a look at <xref linkend="config-prefs-mail-network">, or
-	 ask your system administrator.
+	If you get an error message instead of mail, you probably need
+	to check your network settings.  To learn how to do that, have
+	a look at <xref linkend="config-prefs-mail">, or ask your
+	system administrator.
        </para>
      </note>
 
+
+
+          <tip>
+            <title>Sharing Mailboxes with Other Mail Programs</title>
+            <para>
+              If you want to use <application>Evolution</application>
+              and another email client, such as
+              <application>Mutt</application>, at the same time,
+              here's how:
+              <orderedlist numeration="arabic">
+                <listitem>
+                   <para>
+                      Download your mail in the other application as
+                      you would normally.
+                   </para>
+                  </listitem>
+                <listitem>
+                   <para>
+                      In <application>Evolution</application>
+                      <menuchoice><guimenu>Tools</guimenu><guimenuitem>Mail
+                      Settings</guimenuitem></menuchoice>, and pick the account
+                      you'd like to use to share mail. You may want to
+                      create a new account just for this source of
+                      mail.
+                   </para>
+               </listitem>                     
+               <listitem>
+                   <para>
+                      Under the <guilabel>Receiving Mail</guilabel>
+                      tab, select the type of mail file that your
+                      other mail application uses, and then enter the
+                      full path to that file.
+                   </para>
+                  </listitem>
+                <listitem>
+                   <para>
+                      Click the <guibutton>OK</guibutton> button.
+                   </para>
+                  </listitem>
+                </orderedlist>
+               </para>
+            </tip>
+
+
+<!-- NOT FOR 1.0
        <sect2 id="usage-mail-getnsend-get-news">
-	  <title>Using Evolution for News </title>
+	  <title>Using Evolution for News</title>
 	<para>
 	  Newsgroups are so similar to email that there's no reason not
 	  to read them side by side.  If you want to do that, add a
@@ -323,65 +304,49 @@
 	  messages.
 	</para>
 	</sect2>
+-->
 
-       <sect2 id="usage-mail-getnsend-get-attach">
-	 <title>Attachments and HTML Mail</title>
+     <sect2 id="usage-mail-getnsend-get-attach">
+	 <title>Working with Attachments and HTML Mail</title>
 	 <para>
 	   If someone sends you an <glossterm>attachment</glossterm>,
 	   a file attached to an email,
 	   <application>Evolution</application> will display the file
 	   at the bottom of the message to which it's attached.  Text,
-	   including HTML formatting, will appear as part of the
-	   message.  To minimize download time, and to foil spammers
-	   who use server information to track their messages, images
-	   linked from an HTML message <emphasis>not</emphasis>
-	   display unless you select the
-	   <menuchoice><guimenu>View</guimenu><guisubmenu>Message
-	   Display</guisubmenu><guimenuitem>Load Images
-	   </guimenuitem></menuchoice> option.  For other files,
-	   <application>Evolution</application> will show an icon at
-	   the end of the message.
+	   including HTML formatting and embedded images, will appear
+	   as part of the message, rather than at the end of the
+	   message as an attachment.
+     </para>
+
+     <sect3 id="usage-mail-getnsend-get-attach-actions">
+     <title>Saving or Opening Attachments</title>
+     <para>
+        If you get an attachment with an email message,
+        <application>Ximian Evolution</application> can help you save
+        it or open it with the appropriate applications.
      </para>
      <para>
-       To Save an Attachment to Disk:
+       To save an attachment to disk:
        <orderedlist numeration="arabic">
 	 <listitem>
 	   <para>
-	     Open up the desired email
-	   </para>
-	 </listitem>
-	 <listitem>
-	   <para>
-	     Click on the down arrow at the bottom of the email for the desired
-	     attachment.
-	   </para>
-	 </listitem>
-	 <listitem>
-	   <para>
-	     Select <guibutton>Save to Disk</guibutton>.
+	     Click the downward pointing arrow on the attachment icon
+	     and select <guimenuitem>Save to Disk</guimenuitem>.
 	   </para>
 	 </listitem>
 	 <listitem>
 	   <para>
-	     Choose the directory and filename you wish.
+	     Choose a location and name for the file.
 	   </para>
 	 </listitem>
 	 <listitem>
 	   <para>
-	     Click <guibutton>OK</guibutton>
+	     Click <guibutton>OK</guibutton>.
 	   </para>
 	 </listitem>
        </orderedlist>
       </para>
 
-      <tip id="spaceandbs">
-	<title>Reading email with keyboard</title>
-	<para>
-	  You can click the spacebar to page down while you're reading an email,
-	  and press backspace to page up in an email.  This may help to make
-	  reading your email faster.
-	</para>
-      </tip>
       <para>
 	To Open an Attachment in a Program:
 	<orderedlist numeration="arabic">
@@ -392,7 +357,7 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Click the aarrow next the the attachment icon.
+	      Click the arrow next the attachment icon.
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -403,21 +368,146 @@
 	  </listitem>
 	</orderedlist>
       </para>
-    
-        <para>
-           <application>Evolution</application> can also display
-           HTML-formatted mail, complete with graphics.  Graphics
-           don't load automatically by default, because they can be
-           large and take a long time to download.  They can also be
-           used by spammers to help track who reads their email.  So
-           having them not load automatically helps protect your
-           privacy.
+      <para>
       </para>
+      </sect3>
+
+      <sect3 id="usage-mail-getnsend-get-attach-html">
+      <title>Inline Images in HTML Mail</title>
+      <para>
+         When someone sends you HTML mail that includes an image in
+         the body of the message&mdash; like the welcome message in
+         your Inbox when you first started <application>Ximian
+         Evolution</application>&mdash;
+         <application>Evolution</application> will display the image
+         inside the message.  You can create messages like this by
+         using the
+         <menuchoice><guimenu>Insert</guimenu><guimenuitem>Image</guimenuitem></menuchoice>
+         tool in the message composer.
+      </para>
+
+      <para>
+         If the image isn't included in the message, but is, instead,
+         a link to an image, <application>Evolution</application> can
+         download the image from the Internet for you.  However,
+         <application>Evolution</application> will not display the
+         image unless you ask it to. This is because remotely hosted
+         images can be slow to load and display, and can even be used
+         by spammers to track who reads their email.  Having images
+         not load automatically helps protect your privacy.
+      </para>
+      <para>
+	 If you want the images to load for one message, select 
+	 <menuchoice>
+	   <guimenu>View</guimenu>
+	   <guisubmenu>Message Display</guisubmenu>
+	   <guimenuitem>Load Images</guimenuitem>
+         </menuchoice>.  
+
+         If you want <application>Ximian Evolution</application> to
+         load remotely hosted images more often, go to the
+         <guilabel>Display</guilabel> tab of the
+         <menuchoice>
+	   <guimenu>Tools</guimenu>
+	   <guimenuitem>Mail Settings</guimenuitem>
+         </menuchoice> dialog.
+      </para>
+      <note id="http-proxy">
+	<title>Loading Images from the Net through an HTTP Proxy</title>
+        <para>
+           If you use an HTTP proxy,
+           <application>Evolution</application> must be able to find
+           it through the <systemitem>gnome-vfs</systemitem> subsystem
+           before it can load images from the Internet.  This is also
+           the case if you wish to access weather and news information
+           through the Summary tool. You can tell the GNOME Virtual
+           File System about your HTTP proxy in one of two ways:
+            <variablelist>
+	    <varlistentry>
+	      <term>Configure it with Nautilus</term>
+	      <listitem>
+		<para>
+                 <orderedlist numeration="arabic">
+		    <listitem>
+		      <para>
+			Open a Nautilus window
+	               </para>
+		    </listitem>
+      		    <listitem>
+		      <para>
+	                 Select <menuchoice>
+			  <guimenu>Preferences</guimenu>
+			  <guimenuitem>Edit Preferences</guimenuitem>
+			</menuchoice>.
+	               </para>
+		    </listitem>
+      		    <listitem>
+		      <para>
+			Go to the <guilabel>Navigation</guilabel> tab.
+	               </para>
+		    </listitem>
+      		    <listitem>
+		      <para>
+			Click the <guilabel>Use HTTP Proxy</guilabel>
+			checkbox and enter the location of your HTTP
+			proxy in the <guilabel>Location</guilabel> field.
+	               </para>
+		    </listitem>
+		  </orderedlist>
+                </para>
+	      </listitem>
+	    </varlistentry>
+	    <varlistentry>
+	      <term>Configure it with the gconftool command</term>
+	      <listitem>
+	      <para>
+                 <orderedlist numeration="arabic">
+		    <listitem>
+		      <para>
+                        Open a terminal.
+                      </para>
+		    </listitem>
+		    <listitem>
+		      <para>
+                        Enter the command 
+                        <command>
+                        gconftool --type=bool --set /system/gnome-vfs/use-http-proxy "TRUE"
+                        </command>
+                      </para>
+		    </listitem>
+		    <listitem>
+		      <para>
+                        Enter the command 
+                        <command>
+      gconftool --type=string --set /system/gnome-vfs/http-proxy-host "your-proxy-url"
+                        </command>
+                      </para>
+		    </listitem>
+		    <listitem>
+		      <para>
+                        Enter the command 
+                        <command>
+                        gconftool --type=int --set /system/gnome-vfs/http-proxy-port "8080"
+                        </command>                  
+                      </para>
+		    </listitem>
+		  </orderedlist>
+                </para>
+		<para>
+                  For more information about the gconftool command,
+                  read the gconftool man page.
+                </para>
+	      </listitem>
+	    </varlistentry>
+	  </variablelist>
+         </para>
+      </note>
+     </sect3>
     </sect2>
   </sect1>
 
     <sect1 id="usage-mail-getnsend-send">
-      <title>Writing and Sending Mail</title>
+      <title>Composing New Email Messages</title>
       <para>
          You can start writing a new email message by selecting
          <menuchoice> <guimenu>File</guimenu>
@@ -434,37 +524,52 @@
         <title>New Message Window</title>
         <screenshot>
           <screeninfo>Evolution Main Window</screeninfo>
-          <graphic fileref="figures/newmsg" format="png" srccredit="Aaron Weber">
-        </graphic>
+          <mediaobject><imageobject><imagedata fileref="figures/newmsg" format="png" srccredit="Aaron Weber">
+        </imageobject></mediaobject>
         </screenshot>
       </figure>
 <!-- ==============End of Figure=================================== -->
 
       <para>
-      Enter an address in the <guilabel>To:</guilabel> field.  If you wish
-      enter a  subject in the <guilabel>Subject:</guilabel> and a message in
-      the big empty box at the bottom of the window.  Once you have revised
-      your message, press <guibutton>Send</guibutton>.
+      Enter an address in the <guilabel>To:</guilabel> field.  If you
+      wish, enter a subject in the <guilabel>Subject:</guilabel>, and
+      a message in the box at the bottom of the window.
+      Once you have written your message, press
+      <guibutton>Send</guibutton>.
     </para>
 
       <sect2 id="usage-mail-getnsend-send-delay">
-        <title>Saving Messages for Later</title>
+        <title>Sending Composed Messages Later</title>
         <para>
-           <application>Evolution</application> will send mail immediately unless you tell it to
-           do otherwise by selecting <menuchoice>
-           <guimenu>File</guimenu> <guimenuitem>Send
+           <application>Evolution</application> will send mail
+           immediately unless you tell it to do otherwise by selecting
+           <menuchoice> <guimenu>File</guimenu> <guimenuitem>Send
            Later</guimenuitem></menuchoice>.  This will add your
-           messages to the <guilabel>Outbox</guilabel> queue.  Then,
-           when you press <guibutton>Send</guibutton> in another
-           message, or <guibutton>Get Mail</guibutton> in the main
-           mail window, all your unsent messages will go out at once.
-           You might want to use "Send Later" becuase it gives
-           you a chance to change your mind about a message before you send it.
+           messages to the <guilabel>Outbox</guilabel> queue.  The
+           "Send Later" feature is particularly useful if you use a
+           modem to connect to the Internet and pay per-minute
+           charges: you can remain offline until you need to send
+           mail, then connect and send all your mail at once.  Mail in
+           the outbox is sent when you click
+           <guibutton>Send/Recieve</guibutton> in the main window.
         </para>
         <para>
            To learn more about how you can specify message queue and
            filter behavior, see <xref linkend="config-prefs-mail">.
         </para>
+	  <note>
+            <title>Working Offline</title>
+            <para>
+	      Select
+	      <menuchoice><guimenu>File</guimenu><guimenuitem>Work
+	      Offline</guimenuitem></menuchoice> to have
+	      <application>Ximian Evolution</application> disconnect
+	      from the Internet while you work. When you want to
+	      reconnect, choose
+	      <menuchoice><guimenu>File</guimenu><guimenuitem>Work
+	      Online</guimenuitem></menuchoice>.  Alternativly, you can click the connection button at the bottom left side of the window.
+            </para>
+         </note>
 
       <para>
 	You can also choose to save messages as drafts or as text
@@ -498,7 +603,7 @@
     </sect2>
 
     <sect2 id="usage-mail-getnsend-send-compose">
-      <title>Advanced Mail Composition</title>
+      <title>More About Mail Composition</title>
       <para>
         In the next few sections, you'll see how
 	<application>Evolution</application> handles advanced email
@@ -543,17 +648,10 @@
             will go with it.  Be aware that big attachments can take a
             long time to download.
         </para>
-        <para>
-            When receiving a message that has an attached image,
-            <application>Evolution</application> gives you the choice
-            whether to view it or not.  You can choose to have it
-            always shown, load images only if the sender is in your
-            addressbook, or never load images.
-        </para>
-      </sect3>
+       </sect3>
 
       <sect3 id="usage-mail-getnsend-send-to-types">
-	<title>Types of Recipients</title>
+	<title>Specifying Recipients for Email</title>
         <para>
 	  <application>Evolution</application>, like most email
 	   programs, recognizes three types of addressee: primary
@@ -564,7 +662,7 @@
             The simplest way to direct a message is to put the email
             address or addresses in the <guilabel>To:</guilabel>
             field, which denotes primary recipients.  To send mail to
-            more than one or two people, you can use the the
+            more than one or two people, you can use the
             <guilabel>Cc:</guilabel> field.
           </para>
           <para>
@@ -579,42 +677,22 @@
             <guilabel>Bcc:</guilabel> list are hidden from the other
             recipients of the message. Use it to send mail to large
             groups of people, especially if they don't know each other
-            or if privacy is a concern.
+            or if privacy is a concern.  If your <guilabel>Bcc:</guilabel> field is absent, click
+	    <menuchoice>
+	      <guimenu>View</guimenu>
+	      <guimenuitem>Bcc Field</guimenuitem>
+	    </menuchoice>.
+		
           </para>
 
-            <example id="ex-mail-cc">
-              <title>Using the Cc: field</title>
-              <para>
-                 When Susan sends an email to a client, she puts her
-                 co-worker, Tim, in the in the
-                 <guilabel>Cc:</guilabel> field, so that he know
-                 what's going on.  The client can see that Tim also
-                 received the message, and knows that he can talk to
-                 Tim about the message as well.
-              </para>
-            </example>
-
-          <para>
+         <para>
+           If you frequently write email to the same groups of people,
+           you can create address lists in the Contact Manager, and
+           then send them mail as though they had a single address.
+           To learn how to do that, read <xref
+           linkend="usage-contact-organize-group-list">.
+        </para>
 
-            <example id="ex-mail-bcc">
-              <title>Using the Bcc: field</title>
-              <para>
-                 Tim is sending an email announcement to all of his
-                 company's clients, some of whom are in competition
-                 with each other, and all of whom value their
-                 privacy. He needs to use the
-                 <guilabel>Bcc:</guilabel> field here.  If he puts
-                 every address from his address book's "Clients"
-                 category into the <guilabel>To:</guilabel> or
-                 <guilabel>Cc:</guilabel> fields, he'll make the
-                 company's <emphasis>entire</emphasis> client list
-                 public. But putting his "Clients" addressbook
-                 into the Bcc: section, that will cause them to be hidden
-                 from the competition.  It seems insignificant, but it can
-                 make a huge difference in some situations.
-             </para>
-            </example>
-          </para>
         </sect3>
 
         <sect3 id="usage-mail-getnsend-send-to">
@@ -626,11 +704,17 @@
           drop down list of possible address completions from your
           address book.  If you enter a name or nickname that can go
           with more than one card, Evolution will open a dialog box to
-          ask you which person you meant. Also,
-          <application>Evolution</application> will add a domain to
-          any unqualified addresses.  By default, this is your domain,
-          but you can choose which one mail preferences dialog.
+          ask you which person you meant. 
+
+<!-- Also, <application>Evolution</application> will add a
+          domain to any unqualified addresses.  By default, this is
+          your domain, but you can choose which one mail preferences
+          dialog. NOTE: Bug filed on this: it's not available now,
+          but may be in the future. 
+-->
+
           </para>
+
           <para>
             Alternately, you can click on the
             <guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or
@@ -643,14 +727,14 @@
           <para>
             For more information about using email together with the
             contact manager and the calendar, see <xref
-            linkend="usage-contact-automate"> and <xref
+            linkend="contact-automation-basic"> and <xref
             linkend="usage-calendar-apts">.
           </para>
         </sect3>
       </sect2>
 
       <sect2 id="usage-mail-getnsend-send-reply">
-        <title>Replying to Messages</title>
+        <title>Replying to Email Messages</title>
         <para>
            To reply to a message, press the
            <guibutton>Reply:</guibutton> button while it is selected,
@@ -667,16 +751,13 @@
            with the quoted material as shown in <xref
            linkend="usage-mail-getnsend-reply-fig">.
 
-<!-- note that this figure should have a reply message ready to send,
-with quoted materials and the relevant replies interspersed-->
-<!-- I want to wait for the formatting bugs to be fixed first -->
  <!-- ==============Figure=================================== -->
        <figure id="usage-mail-getnsend-reply-fig">
          <title>Reply Message Window</title>
          <screenshot>
           <screeninfo>Evolution Main Window</screeninfo>
-          <graphic fileref="figures/replymsg" format="png" srccredit="Aaron Weber">
-        </graphic>
+          <mediaobject><imageobject><imagedata fileref="figures/replymsg" format="png" srccredit="Aaron Weber">
+        </imageobject></mediaobject>
         </screenshot>
       </figure>
 <!-- ==============End of Figure=================================== -->
@@ -800,44 +881,48 @@ with quoted materials and the relevant replies interspersed-->
       </sect2>
 
       <sect2 id="usage-mail-getnsend-send-html">
-        <title>Embellish your email with HTML</title>
+        <title>Enhance your email with HTML</title>
         <para>
             Normally, you can't set text styles or insert pictures in
-            emails, which is why you've probably seen people use far
-            too many exclamation points for emphasis, or use
-            <glossterm linkend="emoticon">emoticons</glossterm> to
-            convey their feelings.  However, most newer email programs
-            can display images and text styles as well as basic
-            alignment and paragraph formatting. They do this with
-            <glossterm linkend="html">HTML</glossterm>, just like web
-            pages do.
+            emails, which is why email is often regarded as
+            uncommunicative and cold, and why people often resort to
+            using far too many exclamation points to convey their
+            feelings.  However, most newer email programs can display
+            images and text styles as well as basic alignment and
+            paragraph formatting. They do this with <glossterm
+            linkend="html">HTML</glossterm>, just like web pages do.
         </para>
         <note>
           <title>HTML Mail is not a Default Setting</title>
           <para>
             Some people do not have HTML-capable mail clients, or
             prefer not to receive HTML-enhanced mail because it is
-            slower to download and display.  <emphasis>Some</emphasis>
-            people refer to HTML mail as "the root of all evil" and
-            get very angry if you send them HTML mail, which is why
+            slower to download and display. Because some people may
+            prefer not to get HTML mail,
             <application>Evolution</application> sends plain text
-            unless you explicitly ask for HTML.  To send HTML mail,
-            you will need to select <menuchoice>
+            unless you explicitly ask for HTML.  
+           </para>
+	 </note>
+
+	 <para> You can change the format of an email message between
+            plain text and HTML by choosing <menuchoice>
             <guimenu>Format</guimenu> <guimenuitem>
-            HTML</guimenuitem></menuchoice>.  Alternately, you can set
-            your default mail format preferences in the mail
-            configuration dialog.  See <xref
-            linkend="config-prefs-mail-other"> for more information.
-          </para>
-        </note>
-        <para>
-           HTML formatting tools are located in the toolbar just above
-           the space where you'll actually compose the message, and
-           they also appear in the <guimenu>Insert</guimenu> and
-           <guimenu>Format</guimenu> menus.
-          </para>
-          <para>
-            The icons in the toolbar are explained in <glossterm
+            HTML</guimenuitem></menuchoice>.
+	  </para>
+	  <para>
+            To send all your mail as HTML by default, set your mail
+            format preferences in the mail configuration dialog.  See
+            <xref linkend="config-prefs-mail-other"> for more
+            information.
+      </para>
+      <para>
+	HTML formatting tools are located in the toolbar just above
+	the space where you'll actually compose the message, and
+	they also appear in the <guimenu>Insert</guimenu> and
+	<guimenu>Format</guimenu> menus.
+      </para>
+      <para>
+	The icons in the toolbar are explained in <glossterm
             linkend="tooltip">tool-tips</glossterm>, which appear when
             you hold your mouse over the buttons.  The buttons fall
             into four categories:
@@ -853,7 +938,7 @@ with quoted materials and the relevant replies interspersed-->
                   header from large (1) to tiny (6). Other styles
                   include <guilabel>preformat</guilabel>, to use the HTML
                   tag for preformatted blocks of text, and three types
-                  of <guilabel>List Item</guilabel> for the highly
+                  of bullet points for the highly
                   organized.
                 </para>
               </listitem>
@@ -911,52 +996,218 @@ with quoted materials and the relevant replies interspersed-->
                   right. If you have text selected, the color will
                   apply to the selected text.  If you do not have text
                   selected, the color will apply to whatever you type
-                  next.
+                  next.  You can select a background color or image by
+                  right-clicking on the message background and
+                  selecting <guilabel>Page</guilabel>.
                </para>
             </listitem>
           </varlistentry>
-
-
           </variablelist>
         </para>
         <para>
-	The <guimenu>Insert</guimenu> gives you three opinions which let you
+	The <guimenu>Insert</guimenu> gives you opinions which let you
            spruce up your email to make it more interesting:
 	<variablelist>
 	  <varlistentry>
-	    <term><guimenuitem>Insert Link</guimenuitem></term>
+	    <term><guimenuitem>Link</guimenuitem></term>
 	    <listitem>
 	      <para>
 		Lets you link some text to a website.  Use this tool to put hyperlinks in your HTML
                   messages.  If you don't want special link text, you can just enter the address
                   directly, and <application>Evolution</application>
-                  will recognize it as a link.
+                  will recognize it as a link.  To add a link:
+		<orderedlist numeration="arabic">
+		  <listitem>
+		    <para>
+		      Select the text you wish to link from.
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Right click on the text and click on <guibutton>Link</guibutton>.
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Put the URL you want to use in the <guilabel>URL</guilabel> field.
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Click <guibutton>OK</guibutton>.
+		    </para>
+		  </listitem>
+		</orderedlist>
 	      </para>
+	      <note>
+		<para>
+		  If you're typing a webpage address to be automatically formatted, keep in mind that a space terminates the link.
+		</para>
+	      </note>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term><guimenuitem>Insert Image</guimenuitem></term>
+	    <term><guimenuitem>Image</guimenuitem></term>
 	    <listitem>
 	      <para>
 		Lets you put an image alongside text.
 	      </para>
+	      <para>
+		To insert an image into your email:
+		<orderedlist numeration="arabic">
+		  <listitem>
+		    <para>
+		      Open a new email by clicking <guibutton>New Message</guibutton>
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Make sure that you have the
+		      <menuchoice>
+			<guimenu>Format</guimenu>
+			<guimenuitem>HTML</guimenuitem>
+		      </menuchoice>
+                      selector checked.
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Click the <guibutton>Insert Image</guibutton> button in the toolbar, or select		   
+		         <menuchoice>
+			<guimenu>Insert</guimenu>
+			<guimenuitem>Image</guimenuitem>
+		      </menuchoice>.
+		      </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Choose your image by clicking the <guibutton>Browse</guibutton> button.
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Press <guibutton>Insert</guibutton> to insert the image.
+		    </para>
+		  </listitem>
+		</orderedlist>
+	      </para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term><guimenuitem>Insert Rule</guimenuitem></term>
+	    <term><guimenuitem>Rule</guimenuitem></term>
 	    <listitem>
 	      <para>
 		Inserts a horizontal line into the text to help divide two
 		sections.
 	      </para>
+	      <para>
+		To insert a rule:
+		<orderedlist numeration="arabic">
+		  <listitem>
+		    <para>
+		      Open a new email by clicking <guibutton>New Message</guibutton>
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Make sure that you have the
+		      <menuchoice>
+			<guimenu>Format</guimenu>
+			<guimenuitem>HTML</guimenuitem>
+		      </menuchoice>
+                      selector checked.
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Click the <guibutton>Rule</guibutton> button in the <guilabel>Toolbar</guilabel>.
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Select the type of rule. You can use a plain
+		      line, a 3D line, or a yellow line with flowers.
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Choose the size of the line, as a percentage of the width of the email window.
+		    </para>
+		  </listitem>
+
+		  <listitem>
+		    <para>
+		    Choose the alignment and style.  For the plain
+		    line, you can choose the thickness of the line,
+		    and whether it will be shaded, or solid.  For the
+		    other types, you can only choose alignment.
+		    </para>
+		  </listitem>
+
+		  <listitem>
+		    <para>
+		      Click <guibutton>Insert</guibutton> to insert the rule.
+		    </para>
+		  </listitem>
+		</orderedlist>
+	      </para>
 	    </listitem>
 	  </varlistentry>
-	  </variablelist>
+	  <varlistentry>
+	    <term>Table</term>
+	    <listitem>
+	      <para>
+		Inserts a table into the text to help divide two
+		sections.
+	      </para>
+	      <para>
+		To insert a rule:
+		<orderedlist numeration="arabic">
+		  <listitem>
+		    <para>
+		      Open a new email by clicking <guibutton>New Message</guibutton>
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Make sure that you have the
+		      <menuchoice>
+			<guimenu>Format</guimenu>
+			<guimenuitem>HTML</guimenuitem>
+		      </menuchoice>
+                      selector checked.
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Click the <guibutton>Table</guibutton> button in the <guilabel>Toolbar</guilabel>.
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Select the <guibutton>Template</guibutton> you wish to use.  Each template has a slightly different feel and layout.
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      If you so desire, you may change the other options such as: number of rows, columns, spacing of each cell, and more.
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Click the <guibutton>Insert</guibutton> button.
+		    </para>
+		  </listitem>
+		</orderedlist>
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	</variablelist>
 	To add a hyperlink to your HTML message:
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
-	      Select the text you want to link from
+	      Select the text you want to display as a link.
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -978,57 +1229,238 @@ with quoted materials and the relevant replies interspersed-->
 	  </listitem>
 	</orderedlist>
       </para>
+
       <para>
 	To add an image to your HTML message:
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
-	      Click
+	     Select
 	      <menuchoice>
 		<guimenu>Insert</guimenu>
 		<guimenuitem>Image</guimenuitem>
-	      </menuchoice>
+	      </menuchoice>.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Click <guibutton>Browse</guibutton>
+	      Click <guibutton>Browse</guibutton> to select the image
+	      you want to include in your email.
 	    </para>
 	  </listitem>
+
 	  <listitem>
 	    <para>
-	      Select the image you want
+	    Along the right side of the window, choose the alignment,
+	    border, and other attributes of the image. If you change
+	    the size attributes, the image will be shrunk or stretched
+	    to fit the size you have chosen.
 	    </para>
 	  </listitem>
+
 	  <listitem>
 	    <para>
-	      Press <guibutton>OK</guibutton>
+	     If you would like to make the image a clickable link,
+	     enter a URL in the <guilabel>Link</guilabel> tab of the
+	     window.
 	    </para>
 	  </listitem>
+
 	  <listitem>
 	    <para>
-	      Press <guibutton>Insert</guibutton>
+	      When you are finished, press
+	      <guibutton>Insert</guibutton> to include the image in
+	      your message.
 	    </para>
 	  </listitem>
 	</orderedlist>
-
       </para>
-      <note>
-	<title>A Technical note on HTML Tags</title>
+      <para>
+        You can insert an image into the background of your message by
+        right-clicking on the message background and selecting
+        <guimenuitem>Page</guimenuitem>. From that dialog, you may
+        also select background color and set other general options
+        about the html message you are composing.
+     </para>
+      <sect3 id="html-templates">
+	<title>HTML Templates</title>
+	<para>
+          <application>Evolution</application> not only allows you to
+	  decorate your email with HTML text and graphics, but
+	  provides you with prebuilt templates for you to use when
+	  making these improvements.  You can use these to emphasize a
+	  point or frame an image in an attractive manner.
+        </para>
+	<para>
+	  To include a template into your HTML based email:
+	  <orderedlist numeration="arabic">
+	    <listitem>
+	      <para>
+		Create a new email by clicking <guibutton>New Message</guibutton>.
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+		Make sure that the
+		<menuchoice>
+		  <guimenu>
+		    Format
+		  </guimenu>
+		  <guimenuitem>
+		    HTML
+		  </guimenuitem>
+		</menuchoice>
+		selector is checked.
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+		Click the <guibutton>HTML Template</guibutton> button in the 
+		<guilabel>Toolbar</guilabel> or select 		
+		<menuchoice>
+		  <guimenu>
+		  Insert
+		  </guimenu>
+		  <guimenuitem>
+		    HTML Template
+		  </guimenuitem>
+		</menuchoice>
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+		Select the template type in the
+		<guilabel>Template</guilabel> selection box. Your
+		options are <guilabel>Note</guilabel> and
+		<guilabel>Image Frame</guilabel>.  
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+	      Set the size and alignment of the HTML template.
+	      </para>
+	    </listitem>
+
+	    <listitem>
+	      <para>
+		Click <guibutton>Insert</guibutton> to insert it where the 
+		cursor is.
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+		Once you have inserted the template, click on the text
+		in the template, and enter the text you want to use.
+              </para>
+	      <para>
+		If you have selected an image frame template,
+		right-click on the image and select
+		<guimenuitem>Image</guimenuitem> to select the image
+		you want to place in the frame.
+	      </para>
+	    </listitem>
+	  </orderedlist>
+	</para>
+      </sect3>
+      <sect3 id="composer-tables">
+	<title>Tables in Email</title>
 	<para>
-	  The composer is a <acronym>WYSIWYG</acronym>
-	  (What You See Is What You Get)
-	  editor for HTML. That means that if you enter HTML
-	  directly into the composer&mdash; say, 
-	  <markup role="html">&lt;B&gt;Bold Text&lt;/B&gt</markup>, the
-	  the composer will assume you meant exactly that string
-	  of characters, and not "make this text bold," as an HTML
-	  composition tool or text editor would.
+	  <application>Evolution</application> allows you to put
+	  tables in your HTML email to help organize your thoughts.
+	  These tables are a simplified version of what you might find
+	  in a spreadsheet program like
+	  <application>Gnumeric</application>.
 	</para>
-        </note>
-      </sect2>
+	<para>
+	  To include a table in your email:
+	  <orderedlist numeration="arabic">
+	    <listitem>
+	      <para>
+		Create a new email by clicking <guibutton>New Message</guibutton>.
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+		Make sure you have the
+		<menuchoice>
+		  <guimenu>
+		    Format
+		  </guimenu>
+		  <guimenuitem>
+		    HTML
+		  </guimenuitem>
+		</menuchoice>
+		selector checked.
+	      </para>
+	    </listitem>
+
+	    <listitem>
+	      <para>
+	      Select
+		<menuchoice>
+		  <guimenu>
+		    Insert
+		  </guimenu>
+		  <guimenuitem>
+		    Table
+		  </guimenuitem>
+		</menuchoice>
+		or click the <guiicon>Table</guiicon> button in the
+		toolbar.
+	      </para>
+	    </listitem>
+
+	    <listitem>
+	      <para>
+		Select the template, or style, you want to use for the
+		table.
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+		Set the number of rows and columns you want.
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+		Click the <guibutton>Insert</guibutton> button.
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+		Click in a cell and type to insert text into the table.
+	      </para>
+	    </listitem>
+	  </orderedlist>
+	</para>
+	<para>
+	  You can also edit a table after creation.  Just right-click
+	  on it and select <guimenuitem>Table</guimenuitem> to open
+	  the table editing window again. Or, you can select items
+	  from the <guimenu>Table Delete</guimenu> and <guimenu>Table
+	  Insert</guimenu> menus.
+	  </para>
+	
+	<para>
+	  <tip id="table-tip">
+	  <title>Deleting an Entire Table</title>
+	  <para>
+	    You can delete an entire table by right-clicking on
+            a table or other HTML object in a message, and selecting
+	  <menuchoice>
+	    <guimenu>Table Delete</guimenu>
+	    <guimenuitem>Table</guimenuitem> </menuchoice>.  In an
+	    HMTL message, your signature, templates, and image
+	    inclusions all have tables around them, and you can remove
+	    them completely and quickly with this shortcut.
+	  </para>
+         </tip>
+        </para>
 
-      <sect2 id="usage-mail-getnsend-fwd">
+      </sect3>
+    </sect2>
+    
+    <sect2 id="usage-mail-getnsend-fwd">
         <title>Forwarding Mail</title>
         <para>
           The post office forwards your mail for you when you change
@@ -1099,7 +1531,10 @@ with quoted materials and the relevant replies interspersed-->
 
             <listitem>
               <para>
-               Check your spelling and use complete sentences.
+               Check your spelling and use complete sentences. By
+               default, <application>Evolution</application> will put
+               a red line beneath words it doesn't recognize, as you
+               type them.
               </para>
             </listitem>
 
@@ -1120,7 +1555,7 @@ with quoted materials and the relevant replies interspersed-->
 
 	  <listitem>
 	    <para>
-	      Don't send <glossterm linkend="spam">spam</glossterm>.
+	      Don't send spam.
 	    </para>
 	  </listitem>
 	</itemizedlist>
@@ -1128,30 +1563,124 @@ with quoted materials and the relevant replies interspersed-->
       <para> Happy mailing! </para>
     </sect2>
   </sect1>
+  <sect1 id="rsvp-stuff">
+    <title>RSVPs in Mail</title>
+    <para>
+      If you create an event in the calendar component, you can then
+      send invitations to the attendee list through the
+      <application>Ximian Evolution</application> email tool.  The
+      invitation card is sent as an attachment in iCal format.
+    </para>
+    <para>
+      If you click on the attachment button and click the
+      <guibutton>View Inline</guibutton>, <application>Ximian
+      Evolution</application> will show you information about the
+      meeting, and let you respond to the meeting in several ways.
+      Select the response that you would like, and then click the
+      <guibutton>OK</guibutton> button.
+   </para>
+   <para>
+  Your options are:
+      <variablelist>
+	<varlistentry>
+	  <term>Accept</term>
+	  <listitem>
+	    <para>
+	  Select this entry if you will attend the meeting.  When you
+	  click the <guibutton>OK</guibutton> button, the meeting will
+	  be entered into your calendar.
+	    </para>
+	  </listitem>
+	</varlistentry>
 
-    <sect1 id="usage-mail-subscriptions">
-      <title>Subscription Management</title>
-      <para>
-         <application>Evolution</application> lets you handle your
-         IMAP and newsgroup subscriptions with the same tool: the
-         subscriptions manager.
+	<varlistentry>
+	  <term>>Accept</term>
+	  <listitem>
+	    <para>
+	  Select this entry if you will probably attend the meeting.
+	  When you click the <guibutton>OK</guibutton> button, the
+	  meeting will be entered into your calendar, but marked as
+	  tentative.
+	    </para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term>Decline</term>
+	  <listitem>
+	    <para>
+	  Select this item if you will be unable to attend the
+	  meeting. The meeting will not be entered into your calendar
+	  when you click the <guibutton>OK</guibutton>, although your
+	  response will be sent to the meeting host if you have
+	  checked the <guilabel>RSVP</guilabel> box.
+	    </para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term>RSVP</term>
+	  <listitem>
+	    <para>
+	     Check this box if you would like your response sent to
+	     the meeting organizers.
+	    </para>
+	  </listitem>
+	</varlistentry>
+     </variablelist>
+    </para>
+  </sect1>
 
+  <sect1 id="usage-mail-subscriptions">
+    <title>Subscription Management</title>
+    <para>
+      Since IMAP folders exist on the server, and opening them or
+      checking them takes time, you need fine-grained control over
+      the way that you use IMAP folders.  That's why
+      <application>Evolution</application> has an IMAP
+      subscriptions manager.
+    </para>
+    <para>
+      To use it:
       <orderedlist numeration="arabic">
+	
+	<listitem>
+	  <para>
+	   Select
+	   <menuchoice><guimenu>Tools</guimenu><guimenuitem>Subscribe
+	   to Folders</guimenuitem></menuchoice>.
+	  </para>
+	</listitem>
+
+	<listitem>
+	  <para>
+	    If you have accounts on multiple IMAP servers, select the
+	    server where you'd like to manage your
+	    subscriptions. <application>Evolution</application> will
+	    display a list of available files and folders.
+	  </para>
+	</listitem>
+
 	<listitem>
 	  <para>
-	    In the <guilabel>Store</guilabel> section, click on the
-	    folder to which you wish to subscribe.
+            Select a file or folder by clicking on it.  You will want
+            to select at least the <guilabel>INBOX</guilabel>
+            folder. Depending upon the way your IMAP server is
+            configured, the list of available files may include
+            non-mail folders. If it does, you can ignore them.
 	  </para>
 	</listitem>
+
 	<listitem>
 	  <para>
-	    Click <guibutton>Subscribe</guibutton> to add it to the
-	    subscribed list.
+	    Click the <guibutton>Subscribe</guibutton> to add it to
+	    the subscribed list.
 	  </para>
 	</listitem>
 	<listitem>
 	  <para>
-	    Close the window.
+	    When you have subscribed to the folders you want, close
+	    the window.
 	  </para>
 	</listitem>
       </orderedlist>
@@ -1164,19 +1693,18 @@ with quoted materials and the relevant replies interspersed-->
       <title>What is Encryption?</title>
       <para>
 	Encryption is an ancient method of keeping information safe
-	from prying eyes. <application>Evolution</application> can
-	help you keep your private messages secret.  To do that, it
-	makes use of the external application
+	from prying eyes. <application>Evolution</application> helps
+	you you protect your privacy by using
 	<application>gpg</application>, an implementation of strong
-	<!-- <glossterm linkend="public-key-encryption"> --> Public Key
-	Encryption <!-- </glossterm> -->.
+	<glossterm linkend="public-key-encryption">Public Key
+	Encryption.</glossterm>
       </para>
 
 	<note id="pub-priv">
-	  <title>Public Key?  Private Key?  Whats the difference?</title>
+	  <title>Public Key?  Private Key?  What is the difference?</title>
 	  <para>
 	    GPG uses two keys: public and private.  You can give your
-	    public key to anyone from whom you want to recieve
+	    public key to anyone you want to recieve
 	    encrypted messages, or put it on a public key server so
 	    that people can look it up before contacting you.
 	    <emphasis>Never give your private key to anyone,
@@ -1220,6 +1748,29 @@ with quoted materials and the relevant replies interspersed-->
 	    read.
 	  </para>
 	</example>
+      <tip id="always-sign">
+	<title>Always Sign</title>
+	<para>
+	  You can set <application>Evolution</application> to always sign your email messages:
+	  <orderedlist numeration="arabic">
+	    <listitem>
+	      <para>
+		Open your account preferences.
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+		Open the <guilabel>Security</guilabel> tab.
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+		Click the <guibutton>Always sign outgoing messages when using this account</guibutton> button.
+	      </para>
+	    </listitem>
+	  </orderedlist>
+	</para>
+      </tip>
     </sect2>
 
     <sect2 id="encryption-keygen">
@@ -1392,6 +1943,12 @@ wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
 	integrated into your identity in
 	<application>Evolution</application>.
       </para>
+      <note>
+	<title>What is my Key ID again?</title>
+	<para>
+	  <application>Evolution</application> requires that you know your key ID.  If you don't remember it, you can find it by typing <command>gpg --list-keys</command> in a console window.  Your key ID will be an eight character string with random numbers and letters.
+	</para>
+      </note>
     </sect2>
 
     <sect2 id="encrypt-sending">
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
diff --git a/help/no/usage-print.sgml b/help/no/usage-print.sgml
index 747b6838d0..ebce544b9a 100644
--- a/help/no/usage-print.sgml
+++ b/help/no/usage-print.sgml
@@ -13,6 +13,7 @@
   preview feature to see how your printed output will look.
 </para>
 
+
   <sect1 id="printpreview">
     <title>Print Preview</title>
     <para>
@@ -44,8 +45,8 @@
 	  <title>Print Preview</title>
 	  <screenshot>
 	    <screeninfo>Print Preview</screeninfo>
-	    <graphic fileref="figures/print-preview" format="png" srccredit="Aaron Weber">
-	</graphic>
+	    <mediaobject><imageobject><imagedata fileref="figures/print-preview" format="png" srccredit="Aaron Weber">
+	</imageobject></mediaobject>
 	</screenshot>
       </figure>
 <!-- ==============End of Figure============================== -->
@@ -57,14 +58,25 @@
     <para>
        The printer selection window, shown in <xref
        linkend="print-dest">, lets you choose the format for
-       printing&mdash; <guilabel>Generic
-       Postscript</guilabel>, whether to write to a PDF file,  and whether to print
-       to a file or to an actual printer in Generic Postscript.  If you choose a printer,
-       you'll be asked for the printer command (probably
+       printing&mdash; <guilabel>Generic Postscript</guilabel>,
+       whether to write to a PDF file, and whether to print to a file
+       or to an actual printer in Generic Postscript.  If you choose a
+       printer, you'll be asked for the printer command (probably
        <guilabel>lpr</guilabel>) which your system uses.  If you
        choose to print to a file, you'll need to decide upon a
        filename.  And of course, you'll want to choose a number of
        copies, and whether to collate them.
+
+	<note id="windows-ps">
+	  <title>Printing to PostScript?</title>
+	  <para>
+           PostScript is the file format used by most laser printers,
+           and in UNIX world is the easiest way to print to a file.
+           However, most systems running Microsoft Windows can't
+           recognize or handle PostScript files.  You'll need to print
+           to PDF if you want to share your file with Windows users.
+	  </para>
+	</note>
     </para>
 
  <!-- ==============Figure=================================== -->
@@ -73,8 +85,8 @@
 	  <title>Choosing a Printer</title>
 	  <screenshot>
 	    <screeninfo>Choosing a Printer</screeninfo>
-	    <graphic fileref="figures/print-dest" format="png" srccredit="Aaron Weber">
-	</graphic>
+	    <mediaobject><imageobject><imagedata fileref="figures/print-dest" format="png" srccredit="Aaron Weber">
+	</imageobject></mediaobject>
 	</screenshot>
       </figure>
 <!-- ==============End of Figure============================== -->
diff --git a/help/no/usage-sync.sgml b/help/no/usage-sync.sgml
index 83fef7f6df..5b93a65736 100644
--- a/help/no/usage-sync.sgml
+++ b/help/no/usage-sync.sgml
@@ -1,21 +1,39 @@
-
     <chapter id="usage-sync">
       <title>Synchronizing Evolution with Hand-Held Devices</title>
       <para>
-        This chapter covers is how to synchronize data 
-        installed and configured.  If you need information on how to
-        set up a synchronization system, consult <xref
-        linkend="config-sync">.
+        This chapter is very short.  It describes how to synchronize
+        the data on your Palm-OS device with the data you store in
+        <application>Ximian Evolution</application>.  If you need
+        information on how to set up handheld synchronization, consult
+        <xref linkend="config-sync">.
       </para>
+
       <sect1 id="hotsync">
         <title>Using HotSync</title>
         <para>
-          Put your hand-held device on its cradle and press the
+          Put your hand-held device in its cradle and press the
           HotSync button.
         </para>
+
+<tip id="sync-tip">
+<title>Palm OS v. 4.0 with Passwords</title>
+<para>
+If you use Palm OS v. 4.0 and have password protection turned on for
+your handheld device, you may encounter trouble synchronizing.  If
+this happens, try turning off password protection on your handheld,
+synchronize it with your desktop computer, and then re-enable password
+protection on your handheld.
+</para>
+</tip>
         <para>
-	 If your environment is correctly configured to sync with your
-	 PDA, then it should sync with <application>Evolution</application>.
+	 If you have followed the set up instructions properly, your
+	 Palm-OS device will synchronize data with <application>Ximian
+	 Evolution</application>.
         </para>
+
+         <para>
+            That's it.
+         </para>
+
        </sect1>
     </chapter>