improved filter instructions, vFolder instructions. still need work

	* C/usage-mail.sgml: improved filter instructions, vFolder
	instructions.  still need work though.


	* C/usage-contact.sgml: added screenshot.

	* C/usage-calendar.sgml: added screenshot.

	* C/config-prefs.sgml: added screenshots, and now describes the
	actual prefs dialogs.

	* C/fig/config-camel.png: new (screenshot) file
	* C/fig/filter-druid.png: same
	* C/fig/vfolder-druid.png: same
	* C/fig/calendar.png: same
	* C/fig/contact.png: same
	* C/fig/vfolder-createrule-fig.png: same
	* C/fig/filter-new-fig.png: same
	* C/fig/config-camel-fig.png: same

svn path=/trunk/; revision=3344

20 files changed, 438 insertions, 72 deletions

diff --git a/doc/C/config-prefs.sgml b/doc/C/config-prefs.sgml
index 8ca4dbbc7d..d0ccf2c454 100644
--- a/doc/C/config-prefs.sgml
+++ b/doc/C/config-prefs.sgml
@@ -1,10 +1,10 @@
 
     <chapter id="config-prefs">
-      <title>Advanced Configuration with the Preferences Window</title>
+      <title>Advanced Configuration</title>
       <para>
         To change your configuration settings, select
-        <guimenuitem>Preferences</guimenuitem> from the
-        <guimenu>Settings</guimenu> menu.  This will open the
+        <guimenuitem>Configure Camel Providers</guimenuitem> from the
+        <guimenu>Tools</guimenu> menu.  This will open the
         preferences window, illustrated in <xref linkend="config-prefs-fig">.
         Preferences are seperated into several categories:
         <itemizedlist>
@@ -18,8 +18,22 @@
 
 	  <listitem>
 	    <para>
-              <guilabel>Mail</guilabel>, which allows you to specify
-              your email server and protocols, as well as attachment
+              <guilabel>Sources</guilabel>, which allows you to specify
+              your mail receiving server and protocols.
+            </para>
+          </listitem>
+
+        <listitem>
+         <para>
+           <guilabel>Transports</guilabel>, which allows you to
+           specify how you will send mail.
+           </para>
+         </listitem>
+         </itemizedlist>
+
+<!-- THE FOLLOWING MAY BE REINSTATED:
+
+ as well as attachment
               and HTML handling, forwarding behavior, filters, and
               other <application>Evolution</application> behaviors
               specific to email.  The default behaviors are those
@@ -53,8 +67,8 @@
               startup screen.
             </para>
 	  </listitem>
-	</itemizedlist>
-      
+       </itemizedlist>
+-->
     </para>
 
       <!-- ==============Figure===================== -->
@@ -62,7 +76,7 @@
 	<title>Preferences Dialog</title>
 	<screenshot>
 	  <screeninfo>Preferences dialog</screeninfo>
-	  <graphic fileref="evolution_config_pic" format="png" srccredit="Aaron Weber">
+	  <graphic fileref="fig/config-camel-fig" format="png" srccredit="Aaron Weber">
 	    </graphic>
 	</screenshot>
       </figure>
@@ -74,30 +88,54 @@
       <para>
          If you have only one email address, or use automatic
          forwarding to funnel multiple addresses into one, then you
-         will only need to configure one identity. To create a single
-         user with a single identity, enter the following information:
-         (INSERT detailed DESCRIPTION HERE)
+         will only need to configure one identity. You may, however,
+         want more thatn one.  To alter an identity, click on it in
+         the <guilabel>Identity</guilabel> tab of the
+         <interface>Preferences</interface> window, and then click
+         <guibutton>Edit</guibutton>. To add a new identity, simply
+         click <guibutton>Add</guibutton>.
       </para>
 
       <para>
-         If you have one email accout for your personal life, and one
-	 for work, you'll want to create multiple identities.  You
-	 can do this by: (INSERT DESCRIPTION HERE)
-      </para>
+         In either case, you'll be presented with a dialog box with
+         four fields:
+          <itemizedlist>
+           <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.
+            </para>
+	  </listitem>
+           <listitem>
+	    <para>
+              <guilabel>Email address:</guilabel> Enter your email
+              address in this space.
+            </para>
+	  </listitem>
+           <listitem>
+	    <para>
+              <guilabel>Organization:</guilabel> If you send email as
+              a representative of a company or other organization,
+              enter its name here.
+            </para>
+	  </listitem>
+           <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.
+              They should not be more than three lines long.
+            </para>
+	  </listitem>
+	</itemizedlist>
 
-      <note id="config-prefs-identity-note">
-	<title>Multiple Identities and Network Settings</title>
-	<para>
-           If you use multiple network connections&mdash;if, for
-           example, you dial up an ISP for your personal mail, and use
-           a LAN for your work-related tasks&mdash; you will also have
-           to set seperate network settings for each identity.
-        </para>
-      </note>
+      </para>
     </sect1>
 
     <sect1 id="config-prefs-network">
-      <title>Setting up the Network</title> 
+      <title>Network Settings</title> 
       <para>
         In order to do much of anything with
         <application>Evolution</application>, you need to connect to
@@ -107,14 +145,64 @@
         you'll be using.  If you're switching from another groupware
         or email progam, you can almost certainly use the same
         settings as you did with that program.  Select the
-        <guibutton>Network</guibutton> tab in the
-        <interface>Preferences</interface> window to get started.
+        <guibutton>Sources</guibutton> tab in the
+        <interface>Preferences</interface> window to tell
+        <application>Evolution</application> where you want to get
+        your mail, and click <guibutton>Transports</guibutton> to
+        determine how you want to send your mail.
       </para>
  
-	<sect2 id="config-prefs-network-advanced">
-	  <title>Advanced Network Configuration</title>
+	<sect2 id="config-prefs-network-sources">
+	  <title>Mail Sources</title>
 	  <para>
-            INSERT a little introduction paragraph here.
+            The <interface>Mail Sources</interface> tab allows you to
+            edit, add, or delete methods of retreiving mail from
+            servers.  Clicking on <guibutton>Add</guibutton> or
+            <guibutton>Edit</guibutton> will bring up a dialog box to
+            offer you the following options:
+         <itemizedlist>
+
+           <listitem>
+	    <para>
+              <guilabel>Mail source type:</guilabel>At this point, you
+              can only select from POP or Unix-style mbox files, but
+              additional types will be supported in the future.
+            </para>
+	  </listitem>
+
+           <listitem>
+	    <para>
+              <guilabel>Server:</guilabel>Enter the name of your mail
+              server in this field, eg: mail.mycompany.com
+            </para>
+	  </listitem>
+           <listitem>
+	    <para>
+              <guilabel>Username:</guilabel>Enter your user name here.
+              Eva Lucy Ann Tester's user name is eltester.
+            </para>
+	  </listitem>
+           <listitem>
+	    <para>
+              <guilabel>Authentication:</guilabel> Your system
+              administrator will know which type of authentication
+              your system requires.
+              <application>Evolution</application> can also detect
+              what sorts of authentication are available once it knows
+              where to find the server.
+            </para>
+	  </listitem>
+           <listitem>
+	    <para>
+              <guilabel>Test these values before continuing</guilabel>
+              If this box is checked,
+              <application>Evolution</application> will attempt to
+              make sure that all the other entries in the dialog box
+              are correct.
+            </para>
+        </listitem>
+	</itemizedlist>
+
           </para>
 	  <sect3 id="config-prefs-network-advanced-multiconnect">
 	    <title>Multiple Network Connections</title>
diff --git a/doc/C/fig/calendar.png b/doc/C/fig/calendar.png
new file mode 100644
index 0000000000..91f485aa5f
--- /dev/null
+++ b/doc/C/fig/calendar.png
diff --git a/doc/C/fig/config-camel.png b/doc/C/fig/config-camel.png
new file mode 100644
index 0000000000..e9e5debc78
--- /dev/null
+++ b/doc/C/fig/config-camel.png
diff --git a/doc/C/fig/contact.png b/doc/C/fig/contact.png
new file mode 100644
index 0000000000..ed41ab0e3d
--- /dev/null
+++ b/doc/C/fig/contact.png
diff --git a/doc/C/fig/filter-new-fig.png b/doc/C/fig/filter-new-fig.png
new file mode 100644
index 0000000000..84db72462c
--- /dev/null
+++ b/doc/C/fig/filter-new-fig.png
diff --git a/doc/C/fig/mainwindow-pic.png b/doc/C/fig/mainwindow-pic.png
index b7c6067449..29af304147 100644
--- a/doc/C/fig/mainwindow-pic.png
+++ b/doc/C/fig/mainwindow-pic.png
diff --git a/doc/C/fig/vfolder-createrule-fig.png b/doc/C/fig/vfolder-createrule-fig.png
new file mode 100644
index 0000000000..6be67ad5eb
--- /dev/null
+++ b/doc/C/fig/vfolder-createrule-fig.png
diff --git a/doc/C/usage-calendar.sgml b/doc/C/usage-calendar.sgml
index 83e03c80c0..631a5b711b 100644
--- a/doc/C/usage-calendar.sgml
+++ b/doc/C/usage-calendar.sgml
@@ -13,7 +13,7 @@
 	  <title>Evolution Calendar View</title>
 	  <screenshot>
 	    <screeninfo>Evolution Contact Manager Window</screeninfo>
-	    <graphic fileref="cal-pic" format="png" srccredit="Aaron Weber">
+	    <graphic fileref="fig/calendar" format="png" srccredit="Aaron Weber">
 	    </graphic>
 	  </screenshot>
 	</figure>
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index c50d0ea10b..86cf73fd34 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -37,8 +37,21 @@
 
 	<para>
           To open up your address book, click on
-          <guibutton>Contacts</guibutton> in the shortcut bar.
+          <guibutton>Contacts</guibutton> in the shortcut bar.  The
+          contact manager is illustrated in <xref
+          linkend="usage-contact-fig">
         </para>
+
+
+	<figure id="usage-contact-fig">
+	<title>Evolution Contact Manager</title>
+	<screenshot>
+	  <screeninfo>Evolution Contact Manager Window</screeninfo>
+	  <graphic fileref="fig/contact.png" format="png" srccredit="Aaron Weber">
+	    </graphic>
+	</screenshot>
+	</figure>
+
 	<para>
           The contact manager interface is broken into two main parts.
           The first part is the contact display section.  This can be
@@ -56,7 +69,7 @@
 	<para>
           You can create a new card by pressing the <guibutton>New
           Card</guibutton> button, or by pressing
-          <shortcut><keysym>KEYSYM</keysym></shortcut>. The
+          <keysym>KEYSYM</keysym>. The
           <interface>New Card</interface> window will appear.  It has
           the following fields:
 
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 2dd289e4c3..35fa51fa38 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -704,6 +704,75 @@
 
 	    </para>
 	  </example>
+          <para>
+             To create a vFolder, select <guimenuitem>VFolder
+             Druid</guimenuitem> from the <guimenu>Tools</guimenu>
+             menu in the <interface>main window</interface>.  This
+             will bring up a dialog box that looks suspiciously like
+             the Filter Druid (for more information on filters, see
+             <xref linkend="usage-mail-organize-filters">), and which
+             presents you with a list of vFolders you have previously
+             created. If you have already created vFolders, you can
+             click on them in the frame labelled <guilabel>Select Rule
+             Type</guilabel>, and edit or remove them.  If you have
+             not created any, there will be only one available option:
+             click <guibutton>Add</guibutton> to add a new vFolder.
+          </para>
+          <para>
+             You'll be prompted to create a filtering rule. To do so,
+             select one of the base rules, and click
+             <guibutton>Next</guibutton> to customize it.  Your options are:
+        <itemizedlist>
+             <listitem>
+                <para>
+                   For matching messages: you may select one or more
+                   search criteria; the vFolder you create will
+                   contain messages that match all of
+                   them.
+                 </para>
+               </listitem>
+               <listitem>
+                 <para>
+                    Messages from a certain person: you enter an email
+                    address, and the vFolder will contain any messages
+                    from that address.
+                 </para>
+               </listitem>
+               <listitem>
+                 <para>
+                   Messages to a certain address: any messages sent
+                   directly to this address will be in the vFolder you create.
+                  </para>
+               </listitem>
+               <listitem>
+                 <para>
+                    Messages with a given subject: enter a subject,
+                    and the vFolder will contain messages with that
+                    subject.
+                 </para>
+               </listitem>
+              </itemizedlist>
+            as is shown in <xref linkend="usage-mail-vfolder-fig-createrule">
+
+	   <figure id="usage-mail-vfolder-fig-createrule">
+	     <title>Selecting a vFolder Rule</title>
+	     <screenshot>
+	      <screeninfo>Selecting a vFolder Rule</screeninfo>
+	      <graphic fileref="fig/vfolder-createrule-fig" format="png" srccredit="Aaron Weber">
+	    </graphic>
+	    </screenshot>
+	  </figure>
+          </para>
+          <para>
+ 
+            Once you click <guibutton>Next</guibutton>, you'll
+            customize the vFolder rule.  This process is somewhat
+            complicated, but promises to get much more simple in
+            future versions of <application>Evolution</application>.
+            As it stands now, try clicking different things to have
+            the sentence in the bottom frame make sense.
+
+          </para>
 	</sect2>
 
 	<sect2 id="usage-mail-organize-filters">
@@ -717,9 +786,21 @@
             To create a filter, go to your
             <interface>Inbox</interface>.  Then select
             <guimenuitem>Filter Druid</guimenuitem> from the
-            <guimenu>Tools</guimenu> menu. This will start the a
-            <glossterm> druid</glossterm>, which will allow you to
-            create filters.
+            <guimenu>Tools</guimenu> menu. This will bring up a
+            <glossterm>druid</glossterm>, or assistant, which will
+            allow you to create filters.  The <interface>filter
+            druid</interface> is shown in <xref linkend="usage-mail-filters-fig-new">
+
+           
+	   <figure id="usage-mail-filters-fig-new">
+	     <title>Creating a new Filter</title>
+	     <screenshot>
+	      <screeninfo>Creating a new Filter</screeninfo>
+	      <graphic fileref="fig/filter-new-fig" format="png" srccredit="Aaron Weber">
+	    </graphic>
+	    </screenshot>
+	  </figure>
+
           </para>
 
           <para> The <interface>filter druid</interface> window
@@ -774,3 +855,4 @@
       </sect1>
     </chapter>
 <!-- ================ END OF MAILER CHAPTER ============= -->
+
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index 8ca4dbbc7d..d0ccf2c454 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -1,10 +1,10 @@
 
     <chapter id="config-prefs">
-      <title>Advanced Configuration with the Preferences Window</title>
+      <title>Advanced Configuration</title>
       <para>
         To change your configuration settings, select
-        <guimenuitem>Preferences</guimenuitem> from the
-        <guimenu>Settings</guimenu> menu.  This will open the
+        <guimenuitem>Configure Camel Providers</guimenuitem> from the
+        <guimenu>Tools</guimenu> menu.  This will open the
         preferences window, illustrated in <xref linkend="config-prefs-fig">.
         Preferences are seperated into several categories:
         <itemizedlist>
@@ -18,8 +18,22 @@
 
 	  <listitem>
 	    <para>
-              <guilabel>Mail</guilabel>, which allows you to specify
-              your email server and protocols, as well as attachment
+              <guilabel>Sources</guilabel>, which allows you to specify
+              your mail receiving server and protocols.
+            </para>
+          </listitem>
+
+        <listitem>
+         <para>
+           <guilabel>Transports</guilabel>, which allows you to
+           specify how you will send mail.
+           </para>
+         </listitem>
+         </itemizedlist>
+
+<!-- THE FOLLOWING MAY BE REINSTATED:
+
+ as well as attachment
               and HTML handling, forwarding behavior, filters, and
               other <application>Evolution</application> behaviors
               specific to email.  The default behaviors are those
@@ -53,8 +67,8 @@
               startup screen.
             </para>
 	  </listitem>
-	</itemizedlist>
-      
+       </itemizedlist>
+-->
     </para>
 
       <!-- ==============Figure===================== -->
@@ -62,7 +76,7 @@
 	<title>Preferences Dialog</title>
 	<screenshot>
 	  <screeninfo>Preferences dialog</screeninfo>
-	  <graphic fileref="evolution_config_pic" format="png" srccredit="Aaron Weber">
+	  <graphic fileref="fig/config-camel-fig" format="png" srccredit="Aaron Weber">
 	    </graphic>
 	</screenshot>
       </figure>
@@ -74,30 +88,54 @@
       <para>
          If you have only one email address, or use automatic
          forwarding to funnel multiple addresses into one, then you
-         will only need to configure one identity. To create a single
-         user with a single identity, enter the following information:
-         (INSERT detailed DESCRIPTION HERE)
+         will only need to configure one identity. You may, however,
+         want more thatn one.  To alter an identity, click on it in
+         the <guilabel>Identity</guilabel> tab of the
+         <interface>Preferences</interface> window, and then click
+         <guibutton>Edit</guibutton>. To add a new identity, simply
+         click <guibutton>Add</guibutton>.
       </para>
 
       <para>
-         If you have one email accout for your personal life, and one
-	 for work, you'll want to create multiple identities.  You
-	 can do this by: (INSERT DESCRIPTION HERE)
-      </para>
+         In either case, you'll be presented with a dialog box with
+         four fields:
+          <itemizedlist>
+           <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.
+            </para>
+	  </listitem>
+           <listitem>
+	    <para>
+              <guilabel>Email address:</guilabel> Enter your email
+              address in this space.
+            </para>
+	  </listitem>
+           <listitem>
+	    <para>
+              <guilabel>Organization:</guilabel> If you send email as
+              a representative of a company or other organization,
+              enter its name here.
+            </para>
+	  </listitem>
+           <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.
+              They should not be more than three lines long.
+            </para>
+	  </listitem>
+	</itemizedlist>
 
-      <note id="config-prefs-identity-note">
-	<title>Multiple Identities and Network Settings</title>
-	<para>
-           If you use multiple network connections&mdash;if, for
-           example, you dial up an ISP for your personal mail, and use
-           a LAN for your work-related tasks&mdash; you will also have
-           to set seperate network settings for each identity.
-        </para>
-      </note>
+      </para>
     </sect1>
 
     <sect1 id="config-prefs-network">
-      <title>Setting up the Network</title> 
+      <title>Network Settings</title> 
       <para>
         In order to do much of anything with
         <application>Evolution</application>, you need to connect to
@@ -107,14 +145,64 @@
         you'll be using.  If you're switching from another groupware
         or email progam, you can almost certainly use the same
         settings as you did with that program.  Select the
-        <guibutton>Network</guibutton> tab in the
-        <interface>Preferences</interface> window to get started.
+        <guibutton>Sources</guibutton> tab in the
+        <interface>Preferences</interface> window to tell
+        <application>Evolution</application> where you want to get
+        your mail, and click <guibutton>Transports</guibutton> to
+        determine how you want to send your mail.
       </para>
  
-	<sect2 id="config-prefs-network-advanced">
-	  <title>Advanced Network Configuration</title>
+	<sect2 id="config-prefs-network-sources">
+	  <title>Mail Sources</title>
 	  <para>
-            INSERT a little introduction paragraph here.
+            The <interface>Mail Sources</interface> tab allows you to
+            edit, add, or delete methods of retreiving mail from
+            servers.  Clicking on <guibutton>Add</guibutton> or
+            <guibutton>Edit</guibutton> will bring up a dialog box to
+            offer you the following options:
+         <itemizedlist>
+
+           <listitem>
+	    <para>
+              <guilabel>Mail source type:</guilabel>At this point, you
+              can only select from POP or Unix-style mbox files, but
+              additional types will be supported in the future.
+            </para>
+	  </listitem>
+
+           <listitem>
+	    <para>
+              <guilabel>Server:</guilabel>Enter the name of your mail
+              server in this field, eg: mail.mycompany.com
+            </para>
+	  </listitem>
+           <listitem>
+	    <para>
+              <guilabel>Username:</guilabel>Enter your user name here.
+              Eva Lucy Ann Tester's user name is eltester.
+            </para>
+	  </listitem>
+           <listitem>
+	    <para>
+              <guilabel>Authentication:</guilabel> Your system
+              administrator will know which type of authentication
+              your system requires.
+              <application>Evolution</application> can also detect
+              what sorts of authentication are available once it knows
+              where to find the server.
+            </para>
+	  </listitem>
+           <listitem>
+	    <para>
+              <guilabel>Test these values before continuing</guilabel>
+              If this box is checked,
+              <application>Evolution</application> will attempt to
+              make sure that all the other entries in the dialog box
+              are correct.
+            </para>
+        </listitem>
+	</itemizedlist>
+
           </para>
 	  <sect3 id="config-prefs-network-advanced-multiconnect">
 	    <title>Multiple Network Connections</title>
diff --git a/help/C/fig/calendar.png b/help/C/fig/calendar.png
new file mode 100644
index 0000000000..91f485aa5f
--- /dev/null
+++ b/help/C/fig/calendar.png
diff --git a/help/C/fig/config-camel.png b/help/C/fig/config-camel.png
new file mode 100644
index 0000000000..e9e5debc78
--- /dev/null
+++ b/help/C/fig/config-camel.png
diff --git a/help/C/fig/contact.png b/help/C/fig/contact.png
new file mode 100644
index 0000000000..ed41ab0e3d
--- /dev/null
+++ b/help/C/fig/contact.png
diff --git a/help/C/fig/filter-new-fig.png b/help/C/fig/filter-new-fig.png
new file mode 100644
index 0000000000..84db72462c
--- /dev/null
+++ b/help/C/fig/filter-new-fig.png
diff --git a/help/C/fig/mainwindow-pic.png b/help/C/fig/mainwindow-pic.png
index b7c6067449..29af304147 100644
--- a/help/C/fig/mainwindow-pic.png
+++ b/help/C/fig/mainwindow-pic.png
diff --git a/help/C/fig/vfolder-createrule-fig.png b/help/C/fig/vfolder-createrule-fig.png
new file mode 100644
index 0000000000..6be67ad5eb
--- /dev/null
+++ b/help/C/fig/vfolder-createrule-fig.png
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index 83e03c80c0..631a5b711b 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -13,7 +13,7 @@
 	  <title>Evolution Calendar View</title>
 	  <screenshot>
 	    <screeninfo>Evolution Contact Manager Window</screeninfo>
-	    <graphic fileref="cal-pic" format="png" srccredit="Aaron Weber">
+	    <graphic fileref="fig/calendar" format="png" srccredit="Aaron Weber">
 	    </graphic>
 	  </screenshot>
 	</figure>
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index c50d0ea10b..86cf73fd34 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -37,8 +37,21 @@
 
 	<para>
           To open up your address book, click on
-          <guibutton>Contacts</guibutton> in the shortcut bar.
+          <guibutton>Contacts</guibutton> in the shortcut bar.  The
+          contact manager is illustrated in <xref
+          linkend="usage-contact-fig">
         </para>
+
+
+	<figure id="usage-contact-fig">
+	<title>Evolution Contact Manager</title>
+	<screenshot>
+	  <screeninfo>Evolution Contact Manager Window</screeninfo>
+	  <graphic fileref="fig/contact.png" format="png" srccredit="Aaron Weber">
+	    </graphic>
+	</screenshot>
+	</figure>
+
 	<para>
           The contact manager interface is broken into two main parts.
           The first part is the contact display section.  This can be
@@ -56,7 +69,7 @@
 	<para>
           You can create a new card by pressing the <guibutton>New
           Card</guibutton> button, or by pressing
-          <shortcut><keysym>KEYSYM</keysym></shortcut>. The
+          <keysym>KEYSYM</keysym>. The
           <interface>New Card</interface> window will appear.  It has
           the following fields:
 
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 2dd289e4c3..35fa51fa38 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -704,6 +704,75 @@
 
 	    </para>
 	  </example>
+          <para>
+             To create a vFolder, select <guimenuitem>VFolder
+             Druid</guimenuitem> from the <guimenu>Tools</guimenu>
+             menu in the <interface>main window</interface>.  This
+             will bring up a dialog box that looks suspiciously like
+             the Filter Druid (for more information on filters, see
+             <xref linkend="usage-mail-organize-filters">), and which
+             presents you with a list of vFolders you have previously
+             created. If you have already created vFolders, you can
+             click on them in the frame labelled <guilabel>Select Rule
+             Type</guilabel>, and edit or remove them.  If you have
+             not created any, there will be only one available option:
+             click <guibutton>Add</guibutton> to add a new vFolder.
+          </para>
+          <para>
+             You'll be prompted to create a filtering rule. To do so,
+             select one of the base rules, and click
+             <guibutton>Next</guibutton> to customize it.  Your options are:
+        <itemizedlist>
+             <listitem>
+                <para>
+                   For matching messages: you may select one or more
+                   search criteria; the vFolder you create will
+                   contain messages that match all of
+                   them.
+                 </para>
+               </listitem>
+               <listitem>
+                 <para>
+                    Messages from a certain person: you enter an email
+                    address, and the vFolder will contain any messages
+                    from that address.
+                 </para>
+               </listitem>
+               <listitem>
+                 <para>
+                   Messages to a certain address: any messages sent
+                   directly to this address will be in the vFolder you create.
+                  </para>
+               </listitem>
+               <listitem>
+                 <para>
+                    Messages with a given subject: enter a subject,
+                    and the vFolder will contain messages with that
+                    subject.
+                 </para>
+               </listitem>
+              </itemizedlist>
+            as is shown in <xref linkend="usage-mail-vfolder-fig-createrule">
+
+	   <figure id="usage-mail-vfolder-fig-createrule">
+	     <title>Selecting a vFolder Rule</title>
+	     <screenshot>
+	      <screeninfo>Selecting a vFolder Rule</screeninfo>
+	      <graphic fileref="fig/vfolder-createrule-fig" format="png" srccredit="Aaron Weber">
+	    </graphic>
+	    </screenshot>
+	  </figure>
+          </para>
+          <para>
+ 
+            Once you click <guibutton>Next</guibutton>, you'll
+            customize the vFolder rule.  This process is somewhat
+            complicated, but promises to get much more simple in
+            future versions of <application>Evolution</application>.
+            As it stands now, try clicking different things to have
+            the sentence in the bottom frame make sense.
+
+          </para>
 	</sect2>
 
 	<sect2 id="usage-mail-organize-filters">
@@ -717,9 +786,21 @@
             To create a filter, go to your
             <interface>Inbox</interface>.  Then select
             <guimenuitem>Filter Druid</guimenuitem> from the
-            <guimenu>Tools</guimenu> menu. This will start the a
-            <glossterm> druid</glossterm>, which will allow you to
-            create filters.
+            <guimenu>Tools</guimenu> menu. This will bring up a
+            <glossterm>druid</glossterm>, or assistant, which will
+            allow you to create filters.  The <interface>filter
+            druid</interface> is shown in <xref linkend="usage-mail-filters-fig-new">
+
+           
+	   <figure id="usage-mail-filters-fig-new">
+	     <title>Creating a new Filter</title>
+	     <screenshot>
+	      <screeninfo>Creating a new Filter</screeninfo>
+	      <graphic fileref="fig/filter-new-fig" format="png" srccredit="Aaron Weber">
+	    </graphic>
+	    </screenshot>
+	  </figure>
+
           </para>
 
           <para> The <interface>filter druid</interface> window
@@ -774,3 +855,4 @@
       </sect1>
     </chapter>
 <!-- ================ END OF MAILER CHAPTER ============= -->
+