aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/C/apx-gloss.sgml2
-rw-r--r--doc/C/apx-menuref.sgml413
-rw-r--r--doc/C/fig/filter-new-fig.pngbin11861 -> 11735 bytes
-rw-r--r--doc/C/usage-mail.sgml345
-rw-r--r--doc/ChangeLog14
-rw-r--r--help/C/apx-gloss.sgml2
-rw-r--r--help/C/apx-menuref.sgml413
-rw-r--r--help/C/fig/filter-new-fig.pngbin11861 -> 11735 bytes
-rw-r--r--help/C/usage-mail.sgml345
-rw-r--r--help/ChangeLog14
10 files changed, 1282 insertions, 266 deletions
diff --git a/doc/C/apx-gloss.sgml b/doc/C/apx-gloss.sgml
index 55ab3ed8a1..0f1b73ff09 100644
--- a/doc/C/apx-gloss.sgml
+++ b/doc/C/apx-gloss.sgml
@@ -1,4 +1,4 @@
-<glossary id="glossary">
+<glossary id="apx-gloss">
<title>Glossary</title>
diff --git a/doc/C/apx-menuref.sgml b/doc/C/apx-menuref.sgml
index fd3ad4f65d..f47a921e31 100644
--- a/doc/C/apx-menuref.sgml
+++ b/doc/C/apx-menuref.sgml
@@ -314,7 +314,7 @@
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 File Menu</title>
+ <title>The Message Composer's File Menu</title>
<para>
<variablelist>
<varlistentry>
@@ -375,7 +375,7 @@
</para>
</sect2>
<sect2 id="menuref-mail-editor-edit">
- <title>The Message Composer Edit Menu</title>
+ <title>The Message Composer's Edit Menu</title>
<para>
The <guimenu>Edit</guimenu> menu in the message composer
contains the following items. Keyboard shortcuts are listed
@@ -466,36 +466,101 @@
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).
+ available directly from the Control Center.
+ (FIXME: Write that help doc too) (FIXME: this is in the wrong place!)
</para></listitem>
</varlistentry>
</variablelist>
</para>
</sect2>
-<!--
- <varlistentry>
- <term><guimenu>View</guimenu></term>
- <listitem><para>
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><guimenu>Insert</guimenu></term>
- <listitem><para>
- </para></listitem>
- </varlistentry>
+ <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 seperate 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>
+ <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>
+ <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>
+ </variablelist>
+ </para>
+ </sect2>
</sect1>
-<sect1 id="menuref-cal">
+ <sect1 id="menuref-cal">
<title>The Calendar Menus</title>
<para>
The Main window of the calendar has the same menus as the main
@@ -584,6 +649,7 @@
</variablelist>
</para>
</sect2>
+
<sect2 id="menuref-cal-tools">
<title>The Calendar Tools Menu</title>
<para>
@@ -602,10 +668,312 @@
<sect1 id="menuref-cal-editor">
<title>The Appointment Editor Menus</title>
<para>
- Kevin might do this section.
+ FIXME: Insert Content Here.
</para>
+
+ <sect2 id="menuref-cal-editor-file">
+ <title>The Appintment Editor's File Menu</title>
+ <para>
+ This menu contains several items, including a <guisubmenu>New</guisubmenu>
+ that is identical to that in the
+ <link linkend="menuref-universal-file">main window's file menu</link>.
+ Its 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>
+
+
+ <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>
+ </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.
+ </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>
+
+
+ <varlistentry>
+ <term><guimenuitem>Close</guimenuitem></term>
+ <listitem><para>
+ Close the appointment editor window.
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </sect2>
+
+ <sect2 id="menuref-cal-editor-edit">
+ <title>The Appintment 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 Appintment 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 Appintment 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 Appintment 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 Appintment Editor's Tools Menu</title>
+ <para>
+
+ This menu contains four items, none of which
+ have any functionality yet:
+ <variablelist>
+ <varlistentry>
+ <term><guimenuitem>Item</guimenuitem></term>
+ <listitem><para>
+ FIXME: ?
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guimenuitem>Item</guimenuitem></term>
+ <listitem><para>
+ FIXME: ?
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </sect2>
+
+ <sect2 id="menuref-cal-editor-actions">
+ <title>The Appintment Editor's Actions Menu</title>
+ <para>
+ This menu contains:
+
+ <variablelist>
+ <varlistentry>
+ <term><guimenuitem>Invite Attendees</guimenuitem></term>
+ <listitem><para>
+ Invite the listed attendees to the current event (via email).
+ You may be prompted to specify an invitation message.
+ </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>
+
+ <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>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </sect2>
+
+ <sect2 id="menuref-cal-editor-help">
+ <title>The Appintment Editor's File Menu</title>
+ <para>
+ This menu is empty.
+ </para>
+ </sect2>
+
</sect1>
-
<sect1>
<title>Contact Manager Menus</title>
@@ -676,7 +1044,10 @@
<sect1 id="menuref-contact-editor">
<title>The Contact Editor Menus</title>
<para>
- Kevin might do this section.
+ Most, if not all, of the menu items for this section are still
+ inoperable, but there are vast numbers of them, especially in
+ the <guimenu>Actions</guimenu> menu. When available, I will
+ describe them.
</para>
</sect1>
diff --git a/doc/C/fig/filter-new-fig.png b/doc/C/fig/filter-new-fig.png
index 4c612ce5fc..48ac3b8a7c 100644
--- a/doc/C/fig/filter-new-fig.png
+++ b/doc/C/fig/filter-new-fig.png
Binary files differ
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 8785231686..ed101f6884 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -1029,20 +1029,75 @@ possibly never will be due to security evil. -->
<sect2 id="usage-mail-organize-filters">
<title>Staying organized: Mail Filters in Evolution</title>
<para>
- Filters sort your email for you as it arrives. Most often,
- you'll want to have <application>Evolution</application> put
- mail into different folders, but you can have it do anything
- you like. People who subscribe to multiple mailing lists, or
- who often need to refer to messages they have sent, find
- filters especially helpful to separate personal from
- list-related mail, but they're good for anybody who gets more
- than a few messages a day. To create a filter, select
+ Filters sort your email for you as you send or recieve
+ it. Most often, you'll want to have
+ <application>Evolution</application> put mail into different
+ folders, but you can have it do anything you like. People who
+ subscribe to multiple mailing lists, or who often need to
+ refer to messages they have sent, find filters especially
+ helpful to separate personal from list-related mail, but
+ they're good for anybody who gets more than a few messages a
+ day. To create a filter, open the <interface>filter
+ assistant</interface> by selecting
<menuchoice>
- <guimenu>Tools</guimenu> <guimenuitem>Filter
- Assistant</guimenuitem> </menuchoice>. This will bring up a
- window which will guide you through filter creation. The
- <interface>filter assistant</interface> is shown in <xref
- linkend="usage-mail-filters-fig-new">
+ <guimenu>Tools</guimenu>
+ <guimenuitem>Mail Filters</guimenuitem>
+ </menuchoice>.
+ </para>
+
+ <figure id="usage-mail-filters-fig-assist">
+ <title>The Filter Assistant</title>
+ <screenshot>
+ <screeninfo>The Filter Assistant</screeninfo>
+ <graphic fileref="fig/filter-assist-fig" format="png" srccredit="Aaron Weber">
+ </graphic>
+ </screenshot>
+ </figure>
+
+ <para>
+ The <interface>filter assistant</interface> window contains a
+ list of your current filters, sorted by the order in which
+ they will be performed. From the drop-down box at the top of
+ the window, choose whether to display all your filters, only
+ those filters which are performed on incoming mail, or only
+ filters for outgoing mail.
+ </para>
+ <para>
+ The <interface>filter assistant</interface> also has a set of
+ buttons:
+ <itemizedlist>
+
+ <listitem><para>
+ <guibutton>Add</guibutton> &mdash; Create a new filter.
+ </para></listitem>
+
+ <listitem><para>
+ <guibutton>Edit</guibutton> &mdash; Edit an existing filter.
+ </para></listitem>
+
+ <listitem><para>
+ <guibutton>Delete</guibutton> &mdash; Delete the selected filter.
+ </para></listitem>
+
+ <listitem><para>
+ <guibutton>Up</guibutton> &mdash; Move the selected filter up in the list.
+ </para></listitem>
+
+ <listitem><para>
+ <guibutton>Down</guibutton> &mdash; Move the selected filter down
+ in the list.
+ </para></listitem>
+ </itemizedlist>
+
+ If you don't have any filters set up, the only one you can
+ click is <guibutton>Add</guibutton>. When you do that, (or
+ when you click <guibutton>Edit</guibutton> with a filter
+ selected), the <interface>Add Rule</interface> window appears.
+ </para>
+ <para>
+ That window, shown in <xref
+ linkend="usage-mail-filters-fig-new">, is where you'll
+ actually create your filtering rule.
<figure id="usage-mail-filters-fig-new">
<title>Creating a new Filter</title>
@@ -1052,14 +1107,151 @@ possibly never will be due to security evil. -->
</graphic>
</screenshot>
</figure>
+ </para>
+ <para>
+ Enter a name for your filter in the <guilabel>Name</guilabel>
+ field, and then begin choosing criteria. You can use multiple
+ criteria by pressing <guibutton>More</guibutton>, and remove
+ the last one by pressing <guibutton>Fewer</guibutton>. you can
+ choose from five types of criteria, and you can have as many
+ as you like. If you have multiple criteria, you should also
+ decide between <guilabel>Match all parts</guilabel>, which
+ will make the filter affect only those messages which meet all
+ the criteria you're about to describe, and <guilabel>Match any
+ part</guilabel>, which will make the filter affect any message
+ that meets even one of the criteria.
+ </para>
+ <para>
+ For each of your filter criteria, you must first select what
+ part of the message you want the filter to look at:
+ <variablelist>
+ <varlistentry>
+ <term><guilabel>Sender</guilabel></term>
+ <listitem><para>
+ The author of the message.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Recipients</guilabel></term>
+ <listitem><para>
+ The recipients of the message.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Subject</guilabel></term>
+ <listitem><para>
+ The subject line of the message.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Message Body</guilabel></term>
+ <listitem><para>
+ The message body.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Expression</guilabel></term>
+ <listitem><para>
+ Enter a regular expression (see <xref linkend="apx-gloss">
+ for more information), and <application>Evolution</application>
+ will match it for you.
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ <para>
+ Then choose a rule for matching:
+ <variablelist>
+
+ <varlistentry>
+ <term><guilabel>Contains</guilabel></term>
+ <listitem><para>
+ If the part of the message examined contains the text you enter,
+ the filter will perform its selected action.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Does not contain</guilabel></term>
+ <listitem><para>
+ If the part of the message examined does not contain
+ the text you enter,
+ the filter will perform its selected action.
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+
+ </para>
+ <para>
+ Then, enter the text you want the filter to find, and you're
+ done telling <application>Evolution</application> what sort of
+ messages you want it to filter.
+ </para>
+
+ <para>
+ Now, tell it what to do with those messages. If you want multiple
+ actions, click <guibutton>More</guibutton>; if you want fewer,
+ click <guibutton>Fewer</guibutton>. And choose again:
+ <variablelist>
+ <varlistentry>
+ <term><guilabel>Move to Folder</guilabel></term>
+ <listitem><para>
+ If you select this item, <application>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>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Forward to Address</guilabel></term>
+ <listitem><para>
+ Select this, enter an address, and the addressee will
+ get a copy of the message.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Delete</guilabel></term>
+ <listitem><para>
+ Marks the message for deletion. You can still get the message
+ back, at least until you <guimenuitem>Expunge</guimenuitem> your
+ mail yourself.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Stop Processing</guilabel></term>
+ <listitem><para>
+ Select this if you want to tell all other filters to ignore
+ this message.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><guilabel>Assign Color</guilabel></term>
+ <listitem><para>
+ Select this item, and <application>Evolution</application>
+ will mark the message with whatever color you please.
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ <para>
+ You're done. Click <guibutton>OK</guibutton> to use this
+ filter, or <guibutton>Cancel</guibutton> to close the window
+ without saving any changes.
</para>
- <para> The <interface>filter assistant</interface> window
- contains a window listing rules, and an option to create a
- new rule. To start filtering your mail, click
- <guibutton>Add</guibutton> to add a filtering rule.
- You'll decide when it should take place:
+
+
+ <!-- FIXME: This needs to be in there. But the feature is temporarily
+ disabled and I don't know how it will be reimplemented.
+
<itemizedlist>
<listitem>
<para>
@@ -1079,21 +1271,8 @@ possibly never will be due to security evil. -->
</listitem>
</itemizedlist>
</para>
-
- <para>
- Then, the filter assistant will ask you which emails it should
- act upon. You can set criteria based on message size, the
- sender, primary addressee or Cc: list, words in the subject or
- body of the message, or any combination of criteria. Check the
- boxes next to each criterion you would like to use.
- </para>
- <para>
- Once you've decided which messages to filter, the assistant
- will ask you the sort of action you wish to take. You can
- file, delete, or forward the message, and you can also have it
- be exempted from other filters which would otherwise have
- acted upon it.
- </para>
+
+ -->
<note>
<title>Two Notable Filter Features</title>
@@ -1200,7 +1379,7 @@ possibly never will be due to security evil. -->
</example>
<para>
To create a vFolder, select <guimenuitem>VFolder
- Assistant</guimenuitem> from the <guimenu>Tools</guimenu>
+ Editor</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 Assistant (for more information on filters, see
@@ -1213,92 +1392,36 @@ possibly never will be due to security evil. -->
click <guibutton>Add</guibutton> to add a new vFolder.
</para>
<para>
- You'll be prompted to create a filtering rule. You can build
- your own from the ground up, or select one of several base
- rules to customize. Your options are:
- <variablelist>
- <varlistentry>
- <term><guilabel>For matching messages:</guilabel></term>
- <listitem>
- <para>
- Choose this to create your own set of rules for the
- vFolder. You may select one or more search criteria;
- the vFolder you create will contain messages that
- match all of them.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Messages from a certain person:</guilabel></term>
- <listitem>
- <para>
- The remaining three rules are simpler. Select this
- one to create a vFolder that will contain only
- messages from an address you enter.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Messages to a certain address:</guilabel</term>
- <listitem>
- <para>
- Any messages sent directly to this address will be in
- the vFolder you create. This vFolder is an absolute
- must for people with multiple email addresses.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Messages with a given subject:</guilabel></term>
- <listitem>
- <para>
- Enter a subject, and the vFolder will contain messages
- with that subject.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
-
- The selection window is shown in <xref
+ You can enter a name for your vFolder in the
+ <guilabel>Name</guilabel>. Then, tell
+ <application>Evolution</application> what messages to look
+ for. This process is exactly like filter creation: decide
+ between <guilabel>Match all parts</guilabel> and
+ <guilabel>Match any part</guilabel>, then choose what part of
+ the message to look in, what sort of matching to perform, and
+ specify exactly what text it is that you want to find.
+ </para>
+ <para>
+ The second part, however, is slightly different. In the
+ section of the window labelled <guilabel>vFolder Sources
+ </guilabel> is a list of folders in which
+ <application>Evolution</application> will search for the contents
+ of your vFolder. Click <guibutton>Add</guibutton> to add a folder,
+ or <guibutton>Remove</guibutton> to remove one.
+ </para>
+ <para>
+ The vFolder creation window 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>
+ <screeninfo>Creating 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. The rules for the vFolder you're creating
- will appear as phrases in the bottom pane of the window. You
- can click on the blue underlined text in the phrase to alter
- it to your liking. For example, when I create a vFolder to
- contain all messages from <email>rupert@helixcode.com</email>
- that have the word "evolution" in the message body, the bottom
- frame says: <computeroutput>The From address matches
- rupert@helixcode.com and the body contains
- "evolution".</computeroutput>.
- </para>
</sect2>
-
</sect1>
-</chapter>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+</chapter> \ No newline at end of file
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 4143e67b72..fc9cdc0cf1 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,17 @@
+2000-08-25 Aaron Weber <aaron@helixcode.com>
+
+ * C/usage-mail.sgml: Redid filter and vFolder assistant
+ descriptions.
+
+ * C/fig/filter-new-fig.png: Replaced with new assistant pic.
+
+ * C/fig/filter-assist-fig.png: New file, showing only assistant.
+
+
+ * C/apx-menuref.sgml: Finished message composer and calendar
+ editor menus. Looked at Contact Editor menus and decided to
+ document those features after implementation.
+
2000-08-24 Aaron Weber <aaron@helixcode.com>
* C/apx-menuref.sgml: Message Composer File and Edit menus.
diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
index 55ab3ed8a1..0f1b73ff09 100644
--- a/help/C/apx-gloss.sgml
+++ b/help/C/apx-gloss.sgml
@@ -1,4 +1,4 @@
-<glossary id="glossary">
+<glossary id="apx-gloss">
<title>Glossary</title>
diff --git a/help/C/apx-menuref.sgml b/help/C/apx-menuref.sgml
index fd3ad4f65d..f47a921e31 100644
--- a/help/C/apx-menuref.sgml
+++ b/help/C/apx-menuref.sgml
@@ -314,7 +314,7 @@
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 File Menu</title>
+ <title>The Message Composer's File Menu</title>
<para>
<variablelist>
<varlistentry>
@@ -375,7 +375,7 @@
</para>
</sect2>
<sect2 id="menuref-mail-editor-edit">
- <title>The Message Composer Edit Menu</title>
+ <title>The Message Composer's Edit Menu</title>
<para>
The <guimenu>Edit</guimenu> menu in the message composer
contains the following items. Keyboard shortcuts are listed
@@ -466,36 +466,101 @@
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).
+ available directly from the Control Center.
+ (FIXME: Write that help doc too) (FIXME: this is in the wrong place!)
</para></listitem>
</varlistentry>
</variablelist>
</para>
</sect2>
-<!--
- <varlistentry>
- <term><guimenu>View</guimenu></term>
- <listitem><para>
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><guimenu>Insert</guimenu></term>
- <listitem><para>
- </para></listitem>
- </varlistentry>
+ <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 seperate 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>
+ <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>
+ <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>
+ </variablelist>
+ </para>
+ </sect2>
</sect1>
-<sect1 id="menuref-cal">
+ <sect1 id="menuref-cal">
<title>The Calendar Menus</title>
<para>
The Main window of the calendar has the same menus as the main
@@ -584,6 +649,7 @@
</variablelist>
</para>
</sect2>
+
<sect2 id="menuref-cal-tools">
<title>The Calendar Tools Menu</title>
<para>
@@ -602,10 +668,312 @@
<sect1 id="menuref-cal-editor">
<title>The Appointment Editor Menus</title>
<para>
- Kevin might do this section.
+ FIXME: Insert Content Here.
</para>
+
+ <sect2 id="menuref-cal-editor-file">
+ <title>The Appintment Editor's File Menu</title>
+ <para>
+ This menu contains several items, including a <guisubmenu>New</guisubmenu>
+ that is identical to that in the
+ <link linkend="menuref-universal-file">main window's file menu</link>.
+ Its 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>
+
+
+ <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>
+ </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.
+ </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>
+
+
+ <varlistentry>
+ <term><guimenuitem>Close</guimenuitem></term>
+ <listitem><para>
+ Close the appointment editor window.
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </sect2>
+
+ <sect2 id="menuref-cal-editor-edit">
+ <title>The Appintment 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 Appintment 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 Appintment 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 Appintment 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 Appintment Editor's Tools Menu</title>
+ <para>
+
+ This menu contains four items, none of which
+ have any functionality yet:
+ <variablelist>
+ <varlistentry>
+ <term><guimenuitem>Item</guimenuitem></term>
+ <listitem><para>
+ FIXME: ?
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guimenuitem>Item</guimenuitem></term>
+ <listitem><para>
+ FIXME: ?
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </sect2>
+
+ <sect2 id="menuref-cal-editor-actions">
+ <title>The Appintment Editor's Actions Menu</title>
+ <para>
+ This menu contains:
+
+ <variablelist>
+ <varlistentry>
+ <term><guimenuitem>Invite Attendees</guimenuitem></term>
+ <listitem><para>
+ Invite the listed attendees to the current event (via email).
+ You may be prompted to specify an invitation message.
+ </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>
+
+ <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>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </sect2>
+
+ <sect2 id="menuref-cal-editor-help">
+ <title>The Appintment Editor's File Menu</title>
+ <para>
+ This menu is empty.
+ </para>
+ </sect2>
+
</sect1>
-
<sect1>
<title>Contact Manager Menus</title>
@@ -676,7 +1044,10 @@
<sect1 id="menuref-contact-editor">
<title>The Contact Editor Menus</title>
<para>
- Kevin might do this section.
+ Most, if not all, of the menu items for this section are still
+ inoperable, but there are vast numbers of them, especially in
+ the <guimenu>Actions</guimenu> menu. When available, I will
+ describe them.
</para>
</sect1>
diff --git a/help/C/fig/filter-new-fig.png b/help/C/fig/filter-new-fig.png
index 4c612ce5fc..48ac3b8a7c 100644
--- a/help/C/fig/filter-new-fig.png
+++ b/help/C/fig/filter-new-fig.png
Binary files differ
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 8785231686..ed101f6884 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -1029,20 +1029,75 @@ possibly never will be due to security evil. -->
<sect2 id="usage-mail-organize-filters">
<title>Staying organized: Mail Filters in Evolution</title>
<para>
- Filters sort your email for you as it arrives. Most often,
- you'll want to have <application>Evolution</application> put
- mail into different folders, but you can have it do anything
- you like. People who subscribe to multiple mailing lists, or
- who often need to refer to messages they have sent, find
- filters especially helpful to separate personal from
- list-related mail, but they're good for anybody who gets more
- than a few messages a day. To create a filter, select
+ Filters sort your email for you as you send or recieve
+ it. Most often, you'll want to have
+ <application>Evolution</application> put mail into different
+ folders, but you can have it do anything you like. People who
+ subscribe to multiple mailing lists, or who often need to
+ refer to messages they have sent, find filters especially
+ helpful to separate personal from list-related mail, but
+ they're good for anybody who gets more than a few messages a
+ day. To create a filter, open the <interface>filter
+ assistant</interface> by selecting
<menuchoice>
- <guimenu>Tools</guimenu> <guimenuitem>Filter
- Assistant</guimenuitem> </menuchoice>. This will bring up a
- window which will guide you through filter creation. The
- <interface>filter assistant</interface> is shown in <xref
- linkend="usage-mail-filters-fig-new">
+ <guimenu>Tools</guimenu>
+ <guimenuitem>Mail Filters</guimenuitem>
+ </menuchoice>.
+ </para>
+
+ <figure id="usage-mail-filters-fig-assist">
+ <title>The Filter Assistant</title>
+ <screenshot>
+ <screeninfo>The Filter Assistant</screeninfo>
+ <graphic fileref="fig/filter-assist-fig" format="png" srccredit="Aaron Weber">
+ </graphic>
+ </screenshot>
+ </figure>
+
+ <para>
+ The <interface>filter assistant</interface> window contains a
+ list of your current filters, sorted by the order in which
+ they will be performed. From the drop-down box at the top of
+ the window, choose whether to display all your filters, only
+ those filters which are performed on incoming mail, or only
+ filters for outgoing mail.
+ </para>
+ <para>
+ The <interface>filter assistant</interface> also has a set of
+ buttons:
+ <itemizedlist>
+
+ <listitem><para>
+ <guibutton>Add</guibutton> &mdash; Create a new filter.
+ </para></listitem>
+
+ <listitem><para>
+ <guibutton>Edit</guibutton> &mdash; Edit an existing filter.
+ </para></listitem>
+
+ <listitem><para>
+ <guibutton>Delete</guibutton> &mdash; Delete the selected filter.
+ </para></listitem>
+
+ <listitem><para>
+ <guibutton>Up</guibutton> &mdash; Move the selected filter up in the list.
+ </para></listitem>
+
+ <listitem><para>
+ <guibutton>Down</guibutton> &mdash; Move the selected filter down
+ in the list.
+ </para></listitem>
+ </itemizedlist>
+
+ If you don't have any filters set up, the only one you can
+ click is <guibutton>Add</guibutton>. When you do that, (or
+ when you click <guibutton>Edit</guibutton> with a filter
+ selected), the <interface>Add Rule</interface> window appears.
+ </para>
+ <para>
+ That window, shown in <xref
+ linkend="usage-mail-filters-fig-new">, is where you'll
+ actually create your filtering rule.
<figure id="usage-mail-filters-fig-new">
<title>Creating a new Filter</title>
@@ -1052,14 +1107,151 @@ possibly never will be due to security evil. -->
</graphic>
</screenshot>
</figure>
+ </para>
+ <para>
+ Enter a name for your filter in the <guilabel>Name</guilabel>
+ field, and then begin choosing criteria. You can use multiple
+ criteria by pressing <guibutton>More</guibutton>, and remove
+ the last one by pressing <guibutton>Fewer</guibutton>. you can
+ choose from five types of criteria, and you can have as many
+ as you like. If you have multiple criteria, you should also
+ decide between <guilabel>Match all parts</guilabel>, which
+ will make the filter affect only those messages which meet all
+ the criteria you're about to describe, and <guilabel>Match any
+ part</guilabel>, which will make the filter affect any message
+ that meets even one of the criteria.
+ </para>
+ <para>
+ For each of your filter criteria, you must first select what
+ part of the message you want the filter to look at:
+ <variablelist>
+ <varlistentry>
+ <term><guilabel>Sender</guilabel></term>
+ <listitem><para>
+ The author of the message.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Recipients</guilabel></term>
+ <listitem><para>
+ The recipients of the message.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Subject</guilabel></term>
+ <listitem><para>
+ The subject line of the message.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Message Body</guilabel></term>
+ <listitem><para>
+ The message body.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Expression</guilabel></term>
+ <listitem><para>
+ Enter a regular expression (see <xref linkend="apx-gloss">
+ for more information), and <application>Evolution</application>
+ will match it for you.
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ <para>
+ Then choose a rule for matching:
+ <variablelist>
+
+ <varlistentry>
+ <term><guilabel>Contains</guilabel></term>
+ <listitem><para>
+ If the part of the message examined contains the text you enter,
+ the filter will perform its selected action.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Does not contain</guilabel></term>
+ <listitem><para>
+ If the part of the message examined does not contain
+ the text you enter,
+ the filter will perform its selected action.
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+
+ </para>
+ <para>
+ Then, enter the text you want the filter to find, and you're
+ done telling <application>Evolution</application> what sort of
+ messages you want it to filter.
+ </para>
+
+ <para>
+ Now, tell it what to do with those messages. If you want multiple
+ actions, click <guibutton>More</guibutton>; if you want fewer,
+ click <guibutton>Fewer</guibutton>. And choose again:
+ <variablelist>
+ <varlistentry>
+ <term><guilabel>Move to Folder</guilabel></term>
+ <listitem><para>
+ If you select this item, <application>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>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Forward to Address</guilabel></term>
+ <listitem><para>
+ Select this, enter an address, and the addressee will
+ get a copy of the message.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Delete</guilabel></term>
+ <listitem><para>
+ Marks the message for deletion. You can still get the message
+ back, at least until you <guimenuitem>Expunge</guimenuitem> your
+ mail yourself.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guilabel>Stop Processing</guilabel></term>
+ <listitem><para>
+ Select this if you want to tell all other filters to ignore
+ this message.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><guilabel>Assign Color</guilabel></term>
+ <listitem><para>
+ Select this item, and <application>Evolution</application>
+ will mark the message with whatever color you please.
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ <para>
+ You're done. Click <guibutton>OK</guibutton> to use this
+ filter, or <guibutton>Cancel</guibutton> to close the window
+ without saving any changes.
</para>
- <para> The <interface>filter assistant</interface> window
- contains a window listing rules, and an option to create a
- new rule. To start filtering your mail, click
- <guibutton>Add</guibutton> to add a filtering rule.
- You'll decide when it should take place:
+
+
+ <!-- FIXME: This needs to be in there. But the feature is temporarily
+ disabled and I don't know how it will be reimplemented.
+
<itemizedlist>
<listitem>
<para>
@@ -1079,21 +1271,8 @@ possibly never will be due to security evil. -->
</listitem>
</itemizedlist>
</para>
-
- <para>
- Then, the filter assistant will ask you which emails it should
- act upon. You can set criteria based on message size, the
- sender, primary addressee or Cc: list, words in the subject or
- body of the message, or any combination of criteria. Check the
- boxes next to each criterion you would like to use.
- </para>
- <para>
- Once you've decided which messages to filter, the assistant
- will ask you the sort of action you wish to take. You can
- file, delete, or forward the message, and you can also have it
- be exempted from other filters which would otherwise have
- acted upon it.
- </para>
+
+ -->
<note>
<title>Two Notable Filter Features</title>
@@ -1200,7 +1379,7 @@ possibly never will be due to security evil. -->
</example>
<para>
To create a vFolder, select <guimenuitem>VFolder
- Assistant</guimenuitem> from the <guimenu>Tools</guimenu>
+ Editor</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 Assistant (for more information on filters, see
@@ -1213,92 +1392,36 @@ possibly never will be due to security evil. -->
click <guibutton>Add</guibutton> to add a new vFolder.
</para>
<para>
- You'll be prompted to create a filtering rule. You can build
- your own from the ground up, or select one of several base
- rules to customize. Your options are:
- <variablelist>
- <varlistentry>
- <term><guilabel>For matching messages:</guilabel></term>
- <listitem>
- <para>
- Choose this to create your own set of rules for the
- vFolder. You may select one or more search criteria;
- the vFolder you create will contain messages that
- match all of them.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Messages from a certain person:</guilabel></term>
- <listitem>
- <para>
- The remaining three rules are simpler. Select this
- one to create a vFolder that will contain only
- messages from an address you enter.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Messages to a certain address:</guilabel</term>
- <listitem>
- <para>
- Any messages sent directly to this address will be in
- the vFolder you create. This vFolder is an absolute
- must for people with multiple email addresses.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Messages with a given subject:</guilabel></term>
- <listitem>
- <para>
- Enter a subject, and the vFolder will contain messages
- with that subject.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
-
- The selection window is shown in <xref
+ You can enter a name for your vFolder in the
+ <guilabel>Name</guilabel>. Then, tell
+ <application>Evolution</application> what messages to look
+ for. This process is exactly like filter creation: decide
+ between <guilabel>Match all parts</guilabel> and
+ <guilabel>Match any part</guilabel>, then choose what part of
+ the message to look in, what sort of matching to perform, and
+ specify exactly what text it is that you want to find.
+ </para>
+ <para>
+ The second part, however, is slightly different. In the
+ section of the window labelled <guilabel>vFolder Sources
+ </guilabel> is a list of folders in which
+ <application>Evolution</application> will search for the contents
+ of your vFolder. Click <guibutton>Add</guibutton> to add a folder,
+ or <guibutton>Remove</guibutton> to remove one.
+ </para>
+ <para>
+ The vFolder creation window 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>
+ <screeninfo>Creating 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. The rules for the vFolder you're creating
- will appear as phrases in the bottom pane of the window. You
- can click on the blue underlined text in the phrase to alter
- it to your liking. For example, when I create a vFolder to
- contain all messages from <email>rupert@helixcode.com</email>
- that have the word "evolution" in the message body, the bottom
- frame says: <computeroutput>The From address matches
- rupert@helixcode.com and the body contains
- "evolution".</computeroutput>.
- </para>
</sect2>
-
</sect1>
-</chapter>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+</chapter> \ No newline at end of file
diff --git a/help/ChangeLog b/help/ChangeLog
index 4143e67b72..fc9cdc0cf1 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,17 @@
+2000-08-25 Aaron Weber <aaron@helixcode.com>
+
+ * C/usage-mail.sgml: Redid filter and vFolder assistant
+ descriptions.
+
+ * C/fig/filter-new-fig.png: Replaced with new assistant pic.
+
+ * C/fig/filter-assist-fig.png: New file, showing only assistant.
+
+
+ * C/apx-menuref.sgml: Finished message composer and calendar
+ editor menus. Looked at Contact Editor menus and decided to
+ document those features after implementation.
+
2000-08-24 Aaron Weber <aaron@helixcode.com>
* C/apx-menuref.sgml: Message Composer File and Edit menus.