2005-12-30 [colin] 1.9.100cvs116

	* manual/advanced.xml
		Explain Pre/Post-processing differences.

diff --git a/ChangeLog b/ChangeLog
index f0ec38b5cefec180131d11240e74271360295afb..990de4782aca389f624fd8323413c26b5675a87c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-30 [colin]     1.9.100cvs116
+
+       * manual/advanced.xml
+               Explain Pre/Post-processing differences.
+

 2005-12-30 [colin]     1.9.100cvs115
 
        * src/mh.c
 2005-12-30 [colin]     1.9.100cvs115
 
        * src/mh.c

diff --git a/PATCHSETS b/PATCHSETS
index e07892782a46920fa3254014649ee41b828ca6df..6f0fb140ba1d10edd487420fad722424ac0e81ab 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1099,3 +1099,4 @@
 ( cvs diff -u -r 1.382.2.211 -r 1.382.2.212 src/compose.c;  ) > 1.9.100cvs113.patchset
 ( cvs diff -u -r 1.179.2.85 -r 1.179.2.86 src/imap.c;  ) > 1.9.100cvs114.patchset
 ( cvs diff -u -r 1.79.2.21 -r 1.79.2.22 src/mh.c;  cvs diff -u -r 1.179.2.86 -r 1.179.2.87 src/imap.c;  ) > 1.9.100cvs115.patchset
 ( cvs diff -u -r 1.382.2.211 -r 1.382.2.212 src/compose.c;  ) > 1.9.100cvs113.patchset
 ( cvs diff -u -r 1.179.2.85 -r 1.179.2.86 src/imap.c;  ) > 1.9.100cvs114.patchset
 ( cvs diff -u -r 1.79.2.21 -r 1.79.2.22 src/mh.c;  cvs diff -u -r 1.179.2.86 -r 1.179.2.87 src/imap.c;  ) > 1.9.100cvs115.patchset

+( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 manual/advanced.xml;  ) > 1.9.100cvs116.patchset

diff --git a/configure.ac b/configure.ac
index 10fda3c29ad8317551c77617530ed8ebd488da2a..8873b6b5cab656ba603e82108d3d694a7df38b46 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=115
+EXTRA_VERSION=116

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/manual/advanced.xml b/manual/advanced.xml
index 43c977fdd7bc35a67b66442739f39b9ffc71e821..825adf45569319069894d725c2ec9fd5f3d9ebe5 100644 (file)
--- a/manual/advanced.xml
+++ b/manual/advanced.xml
@@ -49,7 +49,7 @@
     Processing rules are the same as Filtering rules, except that they are applied when entering a folder and apply only to this folder. You can use them to automatically move old mails into an archive folder, or for further dispatching of emails. You can set each folder's Processing rules by right-clicking on it.
     </para>
     <para>
     Processing rules are the same as Filtering rules, except that they are applied when entering a folder and apply only to this folder. You can use them to automatically move old mails into an archive folder, or for further dispatching of emails. You can set each folder's Processing rules by right-clicking on it.
     </para>
     <para>

-    Processing rules are accompanied by Pre-processing and Post-processing rules. Like Processing rules, they apply only when opening a folder, but like Filtering rules, they are shared accross all folders. You can configure them from the Tools menu.
+    Processing rules are accompanied by Pre-processing and Post-processing rules. Like Processing rules, they apply only when opening a folder, but like Filtering rules, they are shared accross all folders. You can configure them from the Tools menu. Pre-processing rules are executed before the folder's specific Processing rules, while Post-processing ones are executed after.

     </para>
   </section>
   <section id="adv_plugins">
     </para>
   </section>
   <section id="adv_plugins">