Re-took most screenshots; last batch had wrong Sawfish theme.

2000-10-10  Aaron Weber  <aaron@helixcode.com>

	* C/fig/*: Re-took most screenshots; last batch had wrong Sawfish
	theme.

	* C/usage-print.sgml: New file, describing printing and print-preview.

	* C/fig/print-preview.png: New file.

	* C/fig/print-dest.png: New file.

	* C/evolution-guide.sgml: Added usage-print entity.

	* C/menuref.sgml: Fixed calendar menu stuff.

	* C/usage-mail.sgml: No more "Actions" menu, other assorted
	menu-related changes.

svn path=/trunk/; revision=5826

24 files changed, 348 insertions, 152 deletions

diff --git a/doc/C/evolution-guide.sgml b/doc/C/evolution-guide.sgml
index 310eea5711..064bb0d305 100644
--- a/doc/C/evolution-guide.sgml
+++ b/doc/C/evolution-guide.sgml
@@ -6,6 +6,7 @@
 <!ENTITY USAGE-CONTACT SYSTEM "usage-contact.sgml">
 <!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.sgml">
 <!ENTITY USAGE-SYNC SYSTEM "usage-sync.sgml">
+<!ENTITY USAGE-PRINT SYSTEM "usage-print.sgml">
 <!ENTITY CONFIG-SETUPASSIST SYSTEM "config-setupassist.sgml">
 <!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml">
 <!ENTITY CONFIG-SYNC SYSTEM "config-sync.sgml">
@@ -88,8 +89,8 @@ implemented. -->
     &USAGE-CONTACT;
     &USAGE-CALENDAR;
 <!--   &USAGE-NOTES; -->
-    &USAGE-SYNC;
-
+    &USAGE-SYNC; 
+    &USAGE-PRINT;
   </part>
   <part id="config">
   <title>Configuring and Managing Evolution</title>
diff --git a/doc/C/fig/calendar.png b/doc/C/fig/calendar.png
index 2054c5d1e4..c9703f4903 100644
--- a/doc/C/fig/calendar.png
+++ b/doc/C/fig/calendar.png
diff --git a/doc/C/fig/contact-editor.png b/doc/C/fig/contact-editor.png
index eea0057a9d..988ad2f918 100644
--- a/doc/C/fig/contact-editor.png
+++ b/doc/C/fig/contact-editor.png
diff --git a/doc/C/fig/contact.png b/doc/C/fig/contact.png
index d79f16acee..a9ed02251a 100644
--- a/doc/C/fig/contact.png
+++ b/doc/C/fig/contact.png
diff --git a/doc/C/fig/mail-composer.png b/doc/C/fig/mail-composer.png
index 4ecd36adaa..22c16365b5 100644
--- a/doc/C/fig/mail-composer.png
+++ b/doc/C/fig/mail-composer.png
diff --git a/doc/C/fig/mail-inbox.png b/doc/C/fig/mail-inbox.png
index 0e7722e72c..7bf0b32189 100644
--- a/doc/C/fig/mail-inbox.png
+++ b/doc/C/fig/mail-inbox.png
diff --git a/doc/C/fig/print-dest.png b/doc/C/fig/print-dest.png
new file mode 100644
index 0000000000..464705711e
--- /dev/null
+++ b/doc/C/fig/print-dest.png
diff --git a/doc/C/fig/print-preview.png b/doc/C/fig/print-preview.png
new file mode 100644
index 0000000000..7f9a8d661a
--- /dev/null
+++ b/doc/C/fig/print-preview.png
diff --git a/doc/C/menuref.sgml b/doc/C/menuref.sgml
index 28e2da4ff7..4b83bf5135 100644
--- a/doc/C/menuref.sgml
+++ b/doc/C/menuref.sgml
@@ -5,22 +5,35 @@
 <chapter id="menuref">
   <title>Menu Reference</title>
   <para>
-    This section will serve as a reference for every menu that
-    <application>Evolution</application> has. If you've ever wondered
-    what some obscure menu item does, this is the chapter for
-    you. When menu items are repeated in
-    <application>Evolution</application>, they're repeated here too.
+    <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>
-    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>Tools</guimenu>, <guimenu>Actions</guimenu>, and
-    <guimenu>Help</guimenu>.  The last of these doesn't change, but
-    the rest of them have contents that will change depending on
-    whether you're looking at mail, contacts, or calendar information.
     In addition, the editor tools for messages, appointments, and
-    contacts all have menu bars.
+    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>
+
 
   </para>
   <sect1 id="menuref-universal">
@@ -891,9 +904,10 @@
 
 	  <varlistentry>
 	    <term><guimenuitem>Print Preview</guimenuitem></term>
-	    <listitem><para>
-              Shows you what your appointment will look like if you print it.
-           </para></listitem>
+	    <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>
 
 
@@ -1049,24 +1063,43 @@
     <sect2 id="menuref-cal-editor-tools">
       <title>The Appointment Editor's Tools Menu</title>
       <para>
-         
-         This menu contains four items, none of which
-         have any functionality yet:
+         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>Item</guimenuitem></term>
+	    <term><guimenuitem>Spelling</guimenuitem></term>
 	    <listitem><para>
-            FIXME: ?
+              Checks the spelling of your calendar entry.
            </para></listitem>
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term><guimenuitem>Item</guimenuitem></term>
+	    <term><guimenuitem>Check Names</guimenuitem></term>
+	    <listitem><para> Checks the names listed here against
+	    those in your address book.
+            </para></listitem>
+	  </varlistentry>
+	</variablelist>
+
+	  <varlistentry>
+	    <term><guimenuitem>Address Book</guimenuitem></term>
 	    <listitem><para>
              FIXME: ?
            </para></listitem>
 	  </varlistentry>
 	</variablelist>
+
+	  <varlistentry>
+	    <term><guisubmenu>Forms</guisubmenu> Submenu</term>
+	    <listitem><para>
+               The Forms submenu lets you alter the
+	       appearance of Calendar Forms. 
+           </para></listitem>
+	  </varlistentry>
+	</variablelist>
+
       </para>
     </sect2>
 
@@ -1077,10 +1110,10 @@
 
          <variablelist>
 	  <varlistentry>
-	    <term><guimenuitem>Invite Attendees</guimenuitem></term>
+	    <term><guimenuitem>Schedule Meeting</guimenuitem></term>
 	    <listitem><para>
-              Invite the listed attendees to the current event (via email).
-              You may be prompted to specify an invitation message.
+              Brings up the <interface>Meeting Invitation</interface> window, 
+              described in <xref linkend="usage-calendar-apts-invite">.
            </para></listitem>
 	  </varlistentry>
 
diff --git a/doc/C/usage-calendar.sgml b/doc/C/usage-calendar.sgml
index 9e1ec88ef2..72f278a424 100644
--- a/doc/C/usage-calendar.sgml
+++ b/doc/C/usage-calendar.sgml
@@ -348,7 +348,6 @@ lack of time, resources, and interest.
 	<guimenu>File</guimenu> <guisubmenu>New</guisubmenu>
 	<guimenuitem>Calendar</guimenuitem>
       </menuchoice>.
-
        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.
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index ebada4540a..c06259ad17 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -1,8 +1,6 @@
 <!--
 <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
 -->
-<!-- NOTE: Queue handling, Outbox, and Written Message Editing are not
-implemented with a stable UI yet, and are described wrong -->
 
 <chapter id="usage-mail"> 
   <title>Evolution Mail</title>
@@ -91,47 +89,23 @@ implemented with a stable UI yet, and are described wrong -->
       </figure>
 <!-- ==============End of Figure============================== -->
 
-
-
       <para>
-         Other actions you can perform are listed, appropriately, in
-         the <guimenu>Actions</guimenu> menu in the menu bar:
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Mark all Messages Read</guimenuitem></term>
-	    <listitem><para>
-               <application>Evolution</application> keeps track of which 
-                messages you have read, and which ones you haven't: 
-                When you've looked at a message for more than a few seconds, 
-                it's no longer marked as new.  If you want to mark all mail 
-                in a folder as read, select this item.
-             </para></listitem>
-	    </varlistentry>
-	  <varlistentry>
-	    <term><guimenuitem>View Message</guimenuitem></term>
-	    <listitem><para>
-                <guimenuitem>View Message</guimenuitem> opens the selected message 
-                in its own window.
-             </para></listitem>
-	    </varlistentry>	  
-	  <varlistentry>
-	    <term><guimenuitem>Edit Message</guimenuitem></term>
-	    <listitem><para>
-               Only available for messages you have written (drafts and
-               mail in the <guilabel>Outbox</guilabel>, this item opens the message
-               in a new mail composition window.
-             </para></listitem>
-	    </varlistentry>
-	  <varlistentry>
-	    <term><guimenuitem>Expunge</guimenuitem></term>
-	    <listitem><para>
-               Clicking the <guibutton>Delete</guibutton> button marks 
-               messages for deletion. <guimenuitem>Expunge</guimenuitem> 
-               wipes them off the face of the earth.               
-             </para></listitem>
-	    </varlistentry>
-	  </variablelist>
+         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.
+       </para>
+       <para>
+         While you're there, have a look at the items items the bottom
+         of the list, which are shortcuts for simple filter and
+         vFolder creation.  You can learn more about filters and
+         vFolders in <xref linkend="usage-mail-organize">; a
+         comprehensive description of this menu (and all the others)
+         is in <xref linkend="menuref">.
       </para>
+
       <sect3 id="usage-mail-listorder">
 	<title>Sorting the message list</title>
 	<para>
@@ -143,11 +117,10 @@ implemented with a stable UI yet, and are described wrong -->
 	<para>
           Aside from sorting the messages, you can opt to have the
           messages threaded. Select <menuchoice>
-          <guimenu>View</guimenu> <guimenuitem>Threaded Message
-          List</guimenuitem> </menuchoice> to turn the threaded view
-          on or off.  If the option selected,
-          <application>Evolution</application> will attempt to
-          associate related messages by using the
+          <guimenu>View</guimenu> <guimenuitem>Threaded</guimenuitem>
+          </menuchoice> to turn the threaded view on or off.  If the
+          option selected, <application>Evolution</application> will
+          attempt to associate related messages by using the
           <systemitem>References</systemitem>,
           <systemitem>In-Reply-To</systemitem>, and
           <systemitem>Subject</systemitem> message headers.  Messages
@@ -168,7 +141,7 @@ implemented with a stable UI yet, and are described wrong -->
         <para>
           If you really want to get rid of it, choose
           <guimenuitem>Expunge</guimenuitem> from the
-          <guimenu>Actions</guimenu> menu.  That will delete it
+          <guimenu>Folder</guimenu> menu.  That will delete it
           permanently. If you want to keep it, click
           <guibutton>Delete</guibutton> again, and it will no longer
           be marked as deleted.  At some point in the future, this
@@ -230,7 +203,7 @@ implemented with a stable UI yet, and are described wrong -->
         your password.  If you'd like
         <application>Evolution</application> to forget your password
         sooner, select
-        <menuchoice><guimenu>Actions</guimenu><guimenuitem>Forget
+        <menuchoice><guimenu>Settings</guimenu><guimenuitem>Forget
         Passwords</guimenuitem></menuchoice>, and it will do so
         immediately.
       </para>
diff --git a/doc/C/usage-print.sgml b/doc/C/usage-print.sgml
new file mode 100644
index 0000000000..25c09abb7b
--- /dev/null
+++ b/doc/C/usage-print.sgml
@@ -0,0 +1,92 @@
+<chapter id="usage-print">
+<title>Printing with Evolution</title>
+<para>
+  This is a very short chapter, because printing with
+  <application>Evolution</application> is not a complex task.  Like
+  most GNOME applications, <application>Evolution</application> uses
+  the gnome-print system, so if you've used any other GNOME
+  application to print, you should be able to print from
+  <application>Evolution</application> immediately.
+</para>
+<para>
+  Whether you're printing a message, a calendar page, or a selection
+  of address cards, you can choose to print directly to a printer, or
+  save the print output to a postscript file.  You can also use the
+  preview feature to see how your printed output will look.
+</para>
+
+  <sect1 id="printpreview">
+    <title>Print Preview</title>
+    <para>
+      <guibutton>Print Preview</guibutton>, appears both as a button
+      in the printing dialog and as an item in the
+      <guimenu>File<guimenu> menu.  In both places, it does the same
+      thing: it opens a new window that displays an image of the current
+      message, calendar, appointment, or address card.
+    </para>
+    <para>
+      That window allows you to select which pages you want to see,
+      and how close you'd like to look at them.  Zoom in or out, fit
+      the page to the window (<guibutton>Fit</guibutton>) or match the
+      width of the page and the window (<guibutton>Fit
+      Width</guibutton>).  If you're satisfied with the way it looks,
+      click <guibutton>Print</guibutton> to send your document on its way.
+    </para>
+
+
+ <!-- ==============Figure=================================== -->
+ 
+      <figure id="print-preview">
+	  <title>Print Preview</title>
+	  <screenshot>
+	    <screeninfo>Print Preview</screeninfo>
+	    <graphic fileref="fig/print-preview" format="png" srccredit="Aaron Weber">
+	</graphic>
+	</screenshot>
+      </figure>
+<!-- ==============End of Figure============================== -->
+
+  </sect1>
+
+  <sect1 id="print-destination">
+    <title>File or Printer?</title>
+    <para>
+       The printer selection window, shown in <xref
+       linkend="print-dest">, lets you choose the format for
+       printing&mdash; at this time, only <guilabel>Generic
+       Postscript</guilabel> is available&mdash; and whether to print
+       to a file or to an actual printer.  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.
+    </para>
+
+ <!-- ==============Figure=================================== -->
+ 
+      <figure id="print-dest">
+	  <title>Choosing a Printer</title>
+	  <screenshot>
+	    <screeninfo>Choosing a Printer</screeninfo>
+	    <graphic fileref="fig/print-dest" format="png" srccredit="Aaron Weber">
+	</graphic>
+	</screenshot>
+      </figure>
+<!-- ==============End of Figure============================== -->
+
+   <para>
+     If you're printing a message that's more than one page, you'll
+     have the option of choosing which pages to print.  If you're
+     printing a calendar entry, you can decide what range of dates to
+     print.  And, if you're printing contact cards, you can decide
+     whether to print only the selected cards, or all of them.
+   </para>
+    <para>
+      When you're ready, click <guibutton>Print</guibutton> to print,
+      <guibutton>Preview</guibutton> to have a look (or another look)
+      at the preview, or <guibutton>Cancel</guibutton> to cancel the
+      whole deal.
+    </para>
+  </sect1>
+</chapter>
diff --git a/help/C/evolution-guide.sgml b/help/C/evolution-guide.sgml
index 310eea5711..064bb0d305 100644
--- a/help/C/evolution-guide.sgml
+++ b/help/C/evolution-guide.sgml
@@ -6,6 +6,7 @@
 <!ENTITY USAGE-CONTACT SYSTEM "usage-contact.sgml">
 <!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.sgml">
 <!ENTITY USAGE-SYNC SYSTEM "usage-sync.sgml">
+<!ENTITY USAGE-PRINT SYSTEM "usage-print.sgml">
 <!ENTITY CONFIG-SETUPASSIST SYSTEM "config-setupassist.sgml">
 <!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml">
 <!ENTITY CONFIG-SYNC SYSTEM "config-sync.sgml">
@@ -88,8 +89,8 @@ implemented. -->
     &USAGE-CONTACT;
     &USAGE-CALENDAR;
 <!--   &USAGE-NOTES; -->
-    &USAGE-SYNC;
-
+    &USAGE-SYNC; 
+    &USAGE-PRINT;
   </part>
   <part id="config">
   <title>Configuring and Managing Evolution</title>
diff --git a/help/C/fig/calendar.png b/help/C/fig/calendar.png
index 2054c5d1e4..c9703f4903 100644
--- a/help/C/fig/calendar.png
+++ b/help/C/fig/calendar.png
diff --git a/help/C/fig/contact-editor.png b/help/C/fig/contact-editor.png
index eea0057a9d..988ad2f918 100644
--- a/help/C/fig/contact-editor.png
+++ b/help/C/fig/contact-editor.png
diff --git a/help/C/fig/contact.png b/help/C/fig/contact.png
index d79f16acee..a9ed02251a 100644
--- a/help/C/fig/contact.png
+++ b/help/C/fig/contact.png
diff --git a/help/C/fig/mail-composer.png b/help/C/fig/mail-composer.png
index 4ecd36adaa..22c16365b5 100644
--- a/help/C/fig/mail-composer.png
+++ b/help/C/fig/mail-composer.png
diff --git a/help/C/fig/mail-inbox.png b/help/C/fig/mail-inbox.png
index 0e7722e72c..7bf0b32189 100644
--- a/help/C/fig/mail-inbox.png
+++ b/help/C/fig/mail-inbox.png
diff --git a/help/C/fig/print-dest.png b/help/C/fig/print-dest.png
new file mode 100644
index 0000000000..464705711e
--- /dev/null
+++ b/help/C/fig/print-dest.png
diff --git a/help/C/fig/print-preview.png b/help/C/fig/print-preview.png
new file mode 100644
index 0000000000..7f9a8d661a
--- /dev/null
+++ b/help/C/fig/print-preview.png
diff --git a/help/C/menuref.sgml b/help/C/menuref.sgml
index 28e2da4ff7..4b83bf5135 100644
--- a/help/C/menuref.sgml
+++ b/help/C/menuref.sgml
@@ -5,22 +5,35 @@
 <chapter id="menuref">
   <title>Menu Reference</title>
   <para>
-    This section will serve as a reference for every menu that
-    <application>Evolution</application> has. If you've ever wondered
-    what some obscure menu item does, this is the chapter for
-    you. When menu items are repeated in
-    <application>Evolution</application>, they're repeated here too.
+    <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>
-    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>Tools</guimenu>, <guimenu>Actions</guimenu>, and
-    <guimenu>Help</guimenu>.  The last of these doesn't change, but
-    the rest of them have contents that will change depending on
-    whether you're looking at mail, contacts, or calendar information.
     In addition, the editor tools for messages, appointments, and
-    contacts all have menu bars.
+    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>
+
 
   </para>
   <sect1 id="menuref-universal">
@@ -891,9 +904,10 @@
 
 	  <varlistentry>
 	    <term><guimenuitem>Print Preview</guimenuitem></term>
-	    <listitem><para>
-              Shows you what your appointment will look like if you print it.
-           </para></listitem>
+	    <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>
 
 
@@ -1049,24 +1063,43 @@
     <sect2 id="menuref-cal-editor-tools">
       <title>The Appointment Editor's Tools Menu</title>
       <para>
-         
-         This menu contains four items, none of which
-         have any functionality yet:
+         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>Item</guimenuitem></term>
+	    <term><guimenuitem>Spelling</guimenuitem></term>
 	    <listitem><para>
-            FIXME: ?
+              Checks the spelling of your calendar entry.
            </para></listitem>
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term><guimenuitem>Item</guimenuitem></term>
+	    <term><guimenuitem>Check Names</guimenuitem></term>
+	    <listitem><para> Checks the names listed here against
+	    those in your address book.
+            </para></listitem>
+	  </varlistentry>
+	</variablelist>
+
+	  <varlistentry>
+	    <term><guimenuitem>Address Book</guimenuitem></term>
 	    <listitem><para>
              FIXME: ?
            </para></listitem>
 	  </varlistentry>
 	</variablelist>
+
+	  <varlistentry>
+	    <term><guisubmenu>Forms</guisubmenu> Submenu</term>
+	    <listitem><para>
+               The Forms submenu lets you alter the
+	       appearance of Calendar Forms. 
+           </para></listitem>
+	  </varlistentry>
+	</variablelist>
+
       </para>
     </sect2>
 
@@ -1077,10 +1110,10 @@
 
          <variablelist>
 	  <varlistentry>
-	    <term><guimenuitem>Invite Attendees</guimenuitem></term>
+	    <term><guimenuitem>Schedule Meeting</guimenuitem></term>
 	    <listitem><para>
-              Invite the listed attendees to the current event (via email).
-              You may be prompted to specify an invitation message.
+              Brings up the <interface>Meeting Invitation</interface> window, 
+              described in <xref linkend="usage-calendar-apts-invite">.
            </para></listitem>
 	  </varlistentry>
 
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index 9e1ec88ef2..72f278a424 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -348,7 +348,6 @@ lack of time, resources, and interest.
 	<guimenu>File</guimenu> <guisubmenu>New</guisubmenu>
 	<guimenuitem>Calendar</guimenuitem>
       </menuchoice>.
-
        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.
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index ebada4540a..c06259ad17 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -1,8 +1,6 @@
 <!--
 <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
 -->
-<!-- NOTE: Queue handling, Outbox, and Written Message Editing are not
-implemented with a stable UI yet, and are described wrong -->
 
 <chapter id="usage-mail"> 
   <title>Evolution Mail</title>
@@ -91,47 +89,23 @@ implemented with a stable UI yet, and are described wrong -->
       </figure>
 <!-- ==============End of Figure============================== -->
 
-
-
       <para>
-         Other actions you can perform are listed, appropriately, in
-         the <guimenu>Actions</guimenu> menu in the menu bar:
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Mark all Messages Read</guimenuitem></term>
-	    <listitem><para>
-               <application>Evolution</application> keeps track of which 
-                messages you have read, and which ones you haven't: 
-                When you've looked at a message for more than a few seconds, 
-                it's no longer marked as new.  If you want to mark all mail 
-                in a folder as read, select this item.
-             </para></listitem>
-	    </varlistentry>
-	  <varlistentry>
-	    <term><guimenuitem>View Message</guimenuitem></term>
-	    <listitem><para>
-                <guimenuitem>View Message</guimenuitem> opens the selected message 
-                in its own window.
-             </para></listitem>
-	    </varlistentry>	  
-	  <varlistentry>
-	    <term><guimenuitem>Edit Message</guimenuitem></term>
-	    <listitem><para>
-               Only available for messages you have written (drafts and
-               mail in the <guilabel>Outbox</guilabel>, this item opens the message
-               in a new mail composition window.
-             </para></listitem>
-	    </varlistentry>
-	  <varlistentry>
-	    <term><guimenuitem>Expunge</guimenuitem></term>
-	    <listitem><para>
-               Clicking the <guibutton>Delete</guibutton> button marks 
-               messages for deletion. <guimenuitem>Expunge</guimenuitem> 
-               wipes them off the face of the earth.               
-             </para></listitem>
-	    </varlistentry>
-	  </variablelist>
+         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.
+       </para>
+       <para>
+         While you're there, have a look at the items items the bottom
+         of the list, which are shortcuts for simple filter and
+         vFolder creation.  You can learn more about filters and
+         vFolders in <xref linkend="usage-mail-organize">; a
+         comprehensive description of this menu (and all the others)
+         is in <xref linkend="menuref">.
       </para>
+
       <sect3 id="usage-mail-listorder">
 	<title>Sorting the message list</title>
 	<para>
@@ -143,11 +117,10 @@ implemented with a stable UI yet, and are described wrong -->
 	<para>
           Aside from sorting the messages, you can opt to have the
           messages threaded. Select <menuchoice>
-          <guimenu>View</guimenu> <guimenuitem>Threaded Message
-          List</guimenuitem> </menuchoice> to turn the threaded view
-          on or off.  If the option selected,
-          <application>Evolution</application> will attempt to
-          associate related messages by using the
+          <guimenu>View</guimenu> <guimenuitem>Threaded</guimenuitem>
+          </menuchoice> to turn the threaded view on or off.  If the
+          option selected, <application>Evolution</application> will
+          attempt to associate related messages by using the
           <systemitem>References</systemitem>,
           <systemitem>In-Reply-To</systemitem>, and
           <systemitem>Subject</systemitem> message headers.  Messages
@@ -168,7 +141,7 @@ implemented with a stable UI yet, and are described wrong -->
         <para>
           If you really want to get rid of it, choose
           <guimenuitem>Expunge</guimenuitem> from the
-          <guimenu>Actions</guimenu> menu.  That will delete it
+          <guimenu>Folder</guimenu> menu.  That will delete it
           permanently. If you want to keep it, click
           <guibutton>Delete</guibutton> again, and it will no longer
           be marked as deleted.  At some point in the future, this
@@ -230,7 +203,7 @@ implemented with a stable UI yet, and are described wrong -->
         your password.  If you'd like
         <application>Evolution</application> to forget your password
         sooner, select
-        <menuchoice><guimenu>Actions</guimenu><guimenuitem>Forget
+        <menuchoice><guimenu>Settings</guimenu><guimenuitem>Forget
         Passwords</guimenuitem></menuchoice>, and it will do so
         immediately.
       </para>
diff --git a/help/C/usage-print.sgml b/help/C/usage-print.sgml
new file mode 100644
index 0000000000..25c09abb7b
--- /dev/null
+++ b/help/C/usage-print.sgml
@@ -0,0 +1,92 @@
+<chapter id="usage-print">
+<title>Printing with Evolution</title>
+<para>
+  This is a very short chapter, because printing with
+  <application>Evolution</application> is not a complex task.  Like
+  most GNOME applications, <application>Evolution</application> uses
+  the gnome-print system, so if you've used any other GNOME
+  application to print, you should be able to print from
+  <application>Evolution</application> immediately.
+</para>
+<para>
+  Whether you're printing a message, a calendar page, or a selection
+  of address cards, you can choose to print directly to a printer, or
+  save the print output to a postscript file.  You can also use the
+  preview feature to see how your printed output will look.
+</para>
+
+  <sect1 id="printpreview">
+    <title>Print Preview</title>
+    <para>
+      <guibutton>Print Preview</guibutton>, appears both as a button
+      in the printing dialog and as an item in the
+      <guimenu>File<guimenu> menu.  In both places, it does the same
+      thing: it opens a new window that displays an image of the current
+      message, calendar, appointment, or address card.
+    </para>
+    <para>
+      That window allows you to select which pages you want to see,
+      and how close you'd like to look at them.  Zoom in or out, fit
+      the page to the window (<guibutton>Fit</guibutton>) or match the
+      width of the page and the window (<guibutton>Fit
+      Width</guibutton>).  If you're satisfied with the way it looks,
+      click <guibutton>Print</guibutton> to send your document on its way.
+    </para>
+
+
+ <!-- ==============Figure=================================== -->
+ 
+      <figure id="print-preview">
+	  <title>Print Preview</title>
+	  <screenshot>
+	    <screeninfo>Print Preview</screeninfo>
+	    <graphic fileref="fig/print-preview" format="png" srccredit="Aaron Weber">
+	</graphic>
+	</screenshot>
+      </figure>
+<!-- ==============End of Figure============================== -->
+
+  </sect1>
+
+  <sect1 id="print-destination">
+    <title>File or Printer?</title>
+    <para>
+       The printer selection window, shown in <xref
+       linkend="print-dest">, lets you choose the format for
+       printing&mdash; at this time, only <guilabel>Generic
+       Postscript</guilabel> is available&mdash; and whether to print
+       to a file or to an actual printer.  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.
+    </para>
+
+ <!-- ==============Figure=================================== -->
+ 
+      <figure id="print-dest">
+	  <title>Choosing a Printer</title>
+	  <screenshot>
+	    <screeninfo>Choosing a Printer</screeninfo>
+	    <graphic fileref="fig/print-dest" format="png" srccredit="Aaron Weber">
+	</graphic>
+	</screenshot>
+      </figure>
+<!-- ==============End of Figure============================== -->
+
+   <para>
+     If you're printing a message that's more than one page, you'll
+     have the option of choosing which pages to print.  If you're
+     printing a calendar entry, you can decide what range of dates to
+     print.  And, if you're printing contact cards, you can decide
+     whether to print only the selected cards, or all of them.
+   </para>
+    <para>
+      When you're ready, click <guibutton>Print</guibutton> to print,
+      <guibutton>Preview</guibutton> to have a look (or another look)
+      at the preview, or <guibutton>Cancel</guibutton> to cancel the
+      whole deal.
+    </para>
+  </sect1>
+</chapter>