[Minor] Improve readability of composites rule configuration

diff --git a/conf/composites.conf b/conf/composites.conf
index e2096b29113d98240ac2876e08e485968272e0a6..82373b093648cadb2fa6dfc8da4ca961858ac2cc 100644 (file)
--- a/conf/composites.conf
+++ b/conf/composites.conf
@@ -98,7 +98,7 @@ composites {
   }
   RCVD_UNAUTH_PBL {
     expression = "RECEIVED_PBL & !RCVD_VIA_SMTP_AUTH";
-    description = "Relayed through ZEN PBL IP without sufficient authentication (possible indicating an open relay)";
+    description = "Relayed through Spamhaus PBL IP without sufficient authentication (possible indicating an open relay)";
     score = 2.0;
     policy = "leave";
   }
@@ -133,18 +133,16 @@ composites {
     policy = "leave";
   }
   BAD_REP_POLICIES {
-    description = "Contains valid policies but are also marked by fuzzy/bayes/surbl/rbl";
+    description = "Contains valid policies but are also marked by fuzzy/bayes/SURBL/RBL";
     expression = "(~g-:policies) & (-g+:fuzzy | -g+:statistics | -g+:surbl | -g+:rbl)";
     score = 0.1;
   }
-
   VIOLATED_DIRECT_SPF {
     description = "Has no Received (or no trusted received relays) and SPF policy fails or soft fails";
     expression = "(R_SPF_FAIL | R_SPF_SOFTFAIL) & (RCVD_COUNT_ZERO | RCVD_NO_TLS_LAST)";
     policy = "leave";
     score = 3.5;
   }
-
   IP_SCORE_FREEMAIL {
     description = "Negate IP_SCORE when message comes from FreeMail";
     expression = "FREEMAIL_FROM & SENDER_REP_SPAM";
@@ -164,12 +162,11 @@ composites {
     score = 7.0;
     group = "scams";
   }
-  
   FREEMAIL_AFF {
-         expression = "(FREEMAIL_FROM | FREEMAIL_ENVFROM | FREEMAIL_REPLYTO) & R_UNDISC_RCPT & (INTRODUCTION | FROM_NAME_HAS_TITLE | FREEMAIL_REPLYTO_NEQ_FROM_DOM)";
-         score = 4.0;
-         policy = "leave";
-         description = "Message exhibits strong characteristics of advance fee fraud (AFF a/k/a '419' spam) involving freemail addresses";
+    expression = "(FREEMAIL_FROM | FREEMAIL_ENVFROM | FREEMAIL_REPLYTO) & R_UNDISC_RCPT & (INTRODUCTION | FROM_NAME_HAS_TITLE | FREEMAIL_REPLYTO_NEQ_FROM_DOM)";
+    score = 4.0;
+    policy = "leave";
+    description = "Message exhibits strong characteristics of advance fee fraud (AFF a/k/a '419' spam) involving freemail addresses";
   }
 
   .include(try=true; priority=1; duplicate=merge) "$LOCAL_CONFDIR/local.d/composites.conf"