better tie-in of spamtrap to resolve ambiguities

[etc/mailfilter.git] / procmail / handlespam

diff --git a/procmail/handlespam b/procmail/handlespam
index 4095f60844eb53ff2ae1710df4b74ff7e46edd01..809e92d412fc82f82addde4a6b663131431f5c0a 100644 (file)
--- a/procmail/handlespam
+++ b/procmail/handlespam
@@ -12,16 +12,12 @@
 #     symptom:  $IS_SPAM is set
 #     reaction: file as spam
 #
-# 4a. message needs to be retrained as spam
-#     symptom:  $CRM_RETRAIN is set to spam
+# 4. message needs to be retrained as spam
+#     symptom:  $RETRAIN is set to spam
 #     reaction: retrain filters, report, and file as spam
 #
-# 4b.  message is spamtrapped
-#     symptom:  $SPAMTRAPPED is set
-#     reaction: train filters, report, and file as spam
-#
 # 5.  message needs to be retrained as ham
-#     symptom:  $CRM_RETRAIN is set to ham
+#     symptom:  $RETRAIN is set to ham
 #     reaction: retrain crm114 and resubmit the message to the spamfilter
 #
 # 6.  spam degree is unknown:
@@ -50,8 +46,7 @@
 }
 
 :0 E
-* 1^0 CRM_RETRAIN ?? spam
-* 1^0 SPAMTRAPPED ?? .
+* RETRAIN ?? spam
 {
   LOG="spamfilter:  (re)training as spam$NL"
   :0 fw
@@ -60,7 +55,7 @@
 }
 
 :0 E
-* CRM_RETRAIN ?? ham
+* RETRAIN ?? ham
 {
   LOG="spamfilter:  retraining as ham$NL"
   :0 fw