diff --git a/doc/C/fig/config-cal.png b/doc/C/fig/config-cal.png index e4f52189de..25b5b68621 100644 Binary files a/doc/C/fig/config-cal.png and b/doc/C/fig/config-cal.png differ diff --git a/doc/C/fig/config-mail.png b/doc/C/fig/config-mail.png index 4596d30c95..cd8543d94e 100644 Binary files a/doc/C/fig/config-mail.png and b/doc/C/fig/config-mail.png differ diff --git a/doc/C/fig/filter-new-fig.png b/doc/C/fig/filter-new-fig.png index 4c77b8a61b..a8b41ca678 100644 Binary files a/doc/C/fig/filter-new-fig.png and b/doc/C/fig/filter-new-fig.png differ diff --git a/doc/C/fig/mail-inbox.png b/doc/C/fig/mail-inbox.png index 7bf0b32189..b4f18640b4 100644 Binary files a/doc/C/fig/mail-inbox.png and b/doc/C/fig/mail-inbox.png differ diff --git a/doc/C/fig/mainwindow-pic.png b/doc/C/fig/mainwindow-pic.png index 9dad9681f6..28bf487bf9 100644 Binary files a/doc/C/fig/mainwindow-pic.png and b/doc/C/fig/mainwindow-pic.png differ diff --git a/doc/C/fig/vfolder-createrule-fig.png b/doc/C/fig/vfolder-createrule-fig.png index 466e7f7b1e..162bebf48c 100644 Binary files a/doc/C/fig/vfolder-createrule-fig.png and b/doc/C/fig/vfolder-createrule-fig.png differ diff --git a/doc/C/menuref.sgml b/doc/C/menuref.sgml index 4b83bf5135..7b5394d0c1 100644 --- a/doc/C/menuref.sgml +++ b/doc/C/menuref.sgml @@ -35,7 +35,7 @@ - + Menus that are the same everywhere @@ -1067,7 +1067,9 @@ Forms submenu, which allows you to alter calendar forms and create your own entries. None of this works yet, though. + + Spelling @@ -1081,7 +1083,7 @@ those in your address book. - + Address Book @@ -1089,7 +1091,7 @@ FIXME: ? - + Forms Submenu @@ -1113,7 +1115,7 @@ Schedule Meeting Brings up the Meeting Invitation window, - described in . + described in . diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml index c06259ad17..9184b77b82 100644 --- a/doc/C/usage-mail.sgml +++ b/doc/C/usage-mail.sgml @@ -1009,9 +1009,10 @@ possibly never will be due to security evil. --> The filter assistant 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. + the window, choose Incoming to display + those filters which are performed on incoming mail, and + On Demand for those which are performed + only when you want. The filter assistant also has a set of @@ -1030,10 +1031,9 @@ possibly never will be due to security evil. --> Delete — Delete the selected filter. - - Up — Move the selected filter up in the list, - so it will be performed sooner. - + Up — Move the + selected filter up in the list, so it will be performed + sooner. Down — Move the selected filter down @@ -1041,10 +1041,11 @@ possibly never will be due to security evil. --> - If you don't have any filters set up, the only one you can - click is Add. When you do that, (or - when you click Edit with a filter - selected), the Add Rule window appears. + If you don't have any filters set up, the only one of those + buttons you can click is Add. When you + do that, (or when you click Edit with a + filter selected), the Add Rule window + appears. That window, shown in - Enter a name for your filter in the Name - field, and then begin choosing criteria. Choose how many - criteria you'd like by pressing More - and Fewer. You can choose from five - types of criteria, and you can have as many as you like; at - least, I've never found a maximum. If you have multiple - criteria, you'll want to decide between Match all - parts, which will make the filter affect only those - messages which meet all the criteria you're about to describe, - and Match any part, which will make the - filter affect any message that meets even one of the criteria. + Enter a name for your filter in the Rule + Name field, and then begin choosing criteria. + Choose how many criteria you'd like by pressing Add + Criterion and Remove + Criterion. If you have multiple criteria, you + should then decide whether to have the filter do its job only + if all criteria are met, or if + any criteria are met. For each of your filter criteria, you must first select what @@ -1098,56 +1096,75 @@ possibly never will be due to security evil. --> + + + Specific Header + The filter can look at any header you + want, even obscure or custom ones like X-Bonus or + X-Archive. Enter the header name, and what you'd like to + match inside it. + + Message Body - The message body. + The actual text of the message. Expression - - Enter a regular expression, and - Evolution will match it for - you. - + Enter a regular + expression, and + Evolution will search the + entire message, headers and all, to match it for you. + - - - - Then choose a rule for matching: - + - Contains + Date Sent - If the part of the message examined contains the text you enter, - the filter will perform its selected action. + You can filter messages by when they were sent: First, + choose how you'd like to match the time— + before, + after and so forth. Then, choose + the time. The filter compare the message's time-stamp + to the system clock when the filter is run, or to a + specific time and date you choose from a calendar. + You can even have it look for messages within a range + of time relative to the filter. For example, you could have + the filter catch all messages sent less + than a week before the filter is run. + + + + + + Date Recieved + + This works the same way as the Date Sent + option, except that it compares the time you got the message + with the dates you specify. - Does not contain + Priority - If the part of the message examined does not contain - the text you enter, - the filter will perform its selected action. + Emails have a standard priority range from -3 (least + important) to 3 (most important). If you can persuade + your friends and co-workers to use the priority levels + honestly, you can filter with them as well. - - - Then, enter the text you want the filter to find, and you're - done telling Evolution what sort of - messages you want it to filter. - - - + Now, tell it what to do with those messages. If you want multiple - actions, click More; if you want fewer, - click Fewer. And choose again: + actions, click Add Action; if you want fewer, + click Remove Action. And choose again: Move to Folder @@ -1191,6 +1208,16 @@ possibly never will be due to security evil. --> will mark the message with whatever color you please. + + + Assign Score + Priority numbers alone don't work, so you + can score emails on the same scale. Then, you can tell + which ones you want to read, or have scored messages + moved, copied, or colored in a subsequent filter. + + + @@ -1307,18 +1334,18 @@ possibly never will be due to security evil. --> - To create a vFolder, select vFolder - Editor from the Tools - menu in the main window. This - will bring up a dialog box that looks suspiciously like - the Filter Assistant (for more information on filters, see - ), and which + To create a vFolder, select + Tools vFolder + Editor . This will bring up a + dialog box that looks suspiciously like the filter window + (for more information on filters, see ), 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 Select Rule - Type, and edit or remove them. If you have - not created any, there will be only one available option: - click Add to add a new vFolder. + created. If you have created any vFolders, they are listed + here, and you can select, edit or remove them if you wish. + If you have not created any, there will be only one available + option: click Add to add a new + vFolder. You can enter a name for your vFolder in the @@ -1328,7 +1355,9 @@ possibly never will be due to security evil. --> between Match all parts and Match any part, 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. + specify exactly what it is that you want to find, be it a + line of text, a score, a regular expression, or a particular date or + range of dates. The second part, however, is slightly different. In the @@ -1356,4 +1385,5 @@ possibly never will be due to security evil. --> - \ No newline at end of file + + diff --git a/doc/C/usage-print.sgml b/doc/C/usage-print.sgml index 25c09abb7b..1af298eb42 100644 --- a/doc/C/usage-print.sgml +++ b/doc/C/usage-print.sgml @@ -20,7 +20,7 @@ Print Preview, appears both as a button in the printing dialog and as an item in the - File menu. In both places, it does the same + File 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. diff --git a/help/C/fig/config-cal.png b/help/C/fig/config-cal.png index e4f52189de..25b5b68621 100644 Binary files a/help/C/fig/config-cal.png and b/help/C/fig/config-cal.png differ diff --git a/help/C/fig/config-mail.png b/help/C/fig/config-mail.png index 4596d30c95..cd8543d94e 100644 Binary files a/help/C/fig/config-mail.png and b/help/C/fig/config-mail.png differ diff --git a/help/C/fig/filter-new-fig.png b/help/C/fig/filter-new-fig.png index 4c77b8a61b..a8b41ca678 100644 Binary files a/help/C/fig/filter-new-fig.png and b/help/C/fig/filter-new-fig.png differ diff --git a/help/C/fig/mail-inbox.png b/help/C/fig/mail-inbox.png index 7bf0b32189..b4f18640b4 100644 Binary files a/help/C/fig/mail-inbox.png and b/help/C/fig/mail-inbox.png differ diff --git a/help/C/fig/mainwindow-pic.png b/help/C/fig/mainwindow-pic.png index 9dad9681f6..28bf487bf9 100644 Binary files a/help/C/fig/mainwindow-pic.png and b/help/C/fig/mainwindow-pic.png differ diff --git a/help/C/fig/vfolder-createrule-fig.png b/help/C/fig/vfolder-createrule-fig.png index 466e7f7b1e..162bebf48c 100644 Binary files a/help/C/fig/vfolder-createrule-fig.png and b/help/C/fig/vfolder-createrule-fig.png differ diff --git a/help/C/menuref.sgml b/help/C/menuref.sgml index 4b83bf5135..7b5394d0c1 100644 --- a/help/C/menuref.sgml +++ b/help/C/menuref.sgml @@ -35,7 +35,7 @@ - + Menus that are the same everywhere @@ -1067,7 +1067,9 @@ Forms submenu, which allows you to alter calendar forms and create your own entries. None of this works yet, though. + + Spelling @@ -1081,7 +1083,7 @@ those in your address book. - + Address Book @@ -1089,7 +1091,7 @@ FIXME: ? - + Forms Submenu @@ -1113,7 +1115,7 @@ Schedule Meeting Brings up the Meeting Invitation window, - described in . + described in . diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml index c06259ad17..9184b77b82 100644 --- a/help/C/usage-mail.sgml +++ b/help/C/usage-mail.sgml @@ -1009,9 +1009,10 @@ possibly never will be due to security evil. --> The filter assistant 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. + the window, choose Incoming to display + those filters which are performed on incoming mail, and + On Demand for those which are performed + only when you want. The filter assistant also has a set of @@ -1030,10 +1031,9 @@ possibly never will be due to security evil. --> Delete — Delete the selected filter. - - Up — Move the selected filter up in the list, - so it will be performed sooner. - + Up — Move the + selected filter up in the list, so it will be performed + sooner. Down — Move the selected filter down @@ -1041,10 +1041,11 @@ possibly never will be due to security evil. --> - If you don't have any filters set up, the only one you can - click is Add. When you do that, (or - when you click Edit with a filter - selected), the Add Rule window appears. + If you don't have any filters set up, the only one of those + buttons you can click is Add. When you + do that, (or when you click Edit with a + filter selected), the Add Rule window + appears. That window, shown in - Enter a name for your filter in the Name - field, and then begin choosing criteria. Choose how many - criteria you'd like by pressing More - and Fewer. You can choose from five - types of criteria, and you can have as many as you like; at - least, I've never found a maximum. If you have multiple - criteria, you'll want to decide between Match all - parts, which will make the filter affect only those - messages which meet all the criteria you're about to describe, - and Match any part, which will make the - filter affect any message that meets even one of the criteria. + Enter a name for your filter in the Rule + Name field, and then begin choosing criteria. + Choose how many criteria you'd like by pressing Add + Criterion and Remove + Criterion. If you have multiple criteria, you + should then decide whether to have the filter do its job only + if all criteria are met, or if + any criteria are met. For each of your filter criteria, you must first select what @@ -1098,56 +1096,75 @@ possibly never will be due to security evil. --> + + + Specific Header + The filter can look at any header you + want, even obscure or custom ones like X-Bonus or + X-Archive. Enter the header name, and what you'd like to + match inside it. + + Message Body - The message body. + The actual text of the message. Expression - - Enter a regular expression, and - Evolution will match it for - you. - + Enter a regular + expression, and + Evolution will search the + entire message, headers and all, to match it for you. + - - - - Then choose a rule for matching: - + - Contains + Date Sent - If the part of the message examined contains the text you enter, - the filter will perform its selected action. + You can filter messages by when they were sent: First, + choose how you'd like to match the time— + before, + after and so forth. Then, choose + the time. The filter compare the message's time-stamp + to the system clock when the filter is run, or to a + specific time and date you choose from a calendar. + You can even have it look for messages within a range + of time relative to the filter. For example, you could have + the filter catch all messages sent less + than a week before the filter is run. + + + + + + Date Recieved + + This works the same way as the Date Sent + option, except that it compares the time you got the message + with the dates you specify. - Does not contain + Priority - If the part of the message examined does not contain - the text you enter, - the filter will perform its selected action. + Emails have a standard priority range from -3 (least + important) to 3 (most important). If you can persuade + your friends and co-workers to use the priority levels + honestly, you can filter with them as well. - - - Then, enter the text you want the filter to find, and you're - done telling Evolution what sort of - messages you want it to filter. - - - + Now, tell it what to do with those messages. If you want multiple - actions, click More; if you want fewer, - click Fewer. And choose again: + actions, click Add Action; if you want fewer, + click Remove Action. And choose again: Move to Folder @@ -1191,6 +1208,16 @@ possibly never will be due to security evil. --> will mark the message with whatever color you please. + + + Assign Score + Priority numbers alone don't work, so you + can score emails on the same scale. Then, you can tell + which ones you want to read, or have scored messages + moved, copied, or colored in a subsequent filter. + + + @@ -1307,18 +1334,18 @@ possibly never will be due to security evil. --> - To create a vFolder, select vFolder - Editor from the Tools - menu in the main window. This - will bring up a dialog box that looks suspiciously like - the Filter Assistant (for more information on filters, see - ), and which + To create a vFolder, select + Tools vFolder + Editor . This will bring up a + dialog box that looks suspiciously like the filter window + (for more information on filters, see ), 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 Select Rule - Type, and edit or remove them. If you have - not created any, there will be only one available option: - click Add to add a new vFolder. + created. If you have created any vFolders, they are listed + here, and you can select, edit or remove them if you wish. + If you have not created any, there will be only one available + option: click Add to add a new + vFolder. You can enter a name for your vFolder in the @@ -1328,7 +1355,9 @@ possibly never will be due to security evil. --> between Match all parts and Match any part, 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. + specify exactly what it is that you want to find, be it a + line of text, a score, a regular expression, or a particular date or + range of dates. The second part, however, is slightly different. In the @@ -1356,4 +1385,5 @@ possibly never will be due to security evil. --> - \ No newline at end of file + + diff --git a/help/C/usage-print.sgml b/help/C/usage-print.sgml index 25c09abb7b..1af298eb42 100644 --- a/help/C/usage-print.sgml +++ b/help/C/usage-print.sgml @@ -20,7 +20,7 @@ Print Preview, appears both as a button in the printing dialog and as an item in the - File menu. In both places, it does the same + File 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.