3 files changed, 13 insertions, 11 deletions
diff --git a/doc/doc-misc/WishList b/doc/doc-misc/WishList
index 2166acb47..35c446d33 100644
--- a/doc/doc-misc/WishList
+++ b/doc/doc-misc/WishList
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-misc/WishList,v 1.10 2004/11/25 11:03:37 ph10 Exp $
+$Cambridge: exim/doc/doc-misc/WishList,v 1.11 2004/11/25 13:54:30 ph10 Exp $
 
 EXIM 4 WISH LIST
 ----------------
@@ -1603,14 +1603,6 @@ A modifier that sets a delay between lines for multiline responses.
 Given that pids are reused non-cyclically these days, is this actually useful?
 ------------------------------------------------------------------------------
 
-(269) 26-May-04 U Run both a system and a user filter in test mode
-
-    exim -bF systemfilter -bf userfilter -f sender@dom < message
-
-This would allow testing the way the userfilter handles the system
-variables set by the systemfilter.
-------------------------------------------------------------------------------
-
 (270) 01-Jun-04 M Add headers at top and middle
 
 Various initiatives like SPF and DomainKeys require header lines to be added
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index cd5fe9821..a9980534c 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.40 2004/11/25 10:26:04 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.41 2004/11/25 13:54:31 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -176,6 +176,8 @@ Exim version 4.44
     to set them up, because the GnuTLS error message doesn't include the name
     of the failing file when there is a problem reading it.
 
+42. Allow both -bf and -bF in the same test run.
+
 
 Exim version 4.43
 -----------------
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 0496b39c5..f8e31469d 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/NewStuff,v 1.17 2004/11/24 16:36:19 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/NewStuff,v 1.18 2004/11/25 13:54:31 ph10 Exp $
 
 New Features in Exim
 --------------------
@@ -206,6 +206,14 @@ Version 4.44
     "QT=", and it is measured from the time that the message starts to be
     received, so it includes the reception time.
 
+18. It is now possible to use both -bF and -bf on the same command, in order to
+    test a system filter and a user filter in the same run. For example:
+
+      exim -bF /system/filter -bf /user/filter </test/message
+
+    This is helpful when the system filter adds header lines or sets filter
+    variables that are used by the user filter.
+
 
 Version 4.43
 ------------