Merge pull request #2850 from heraklit256/rule-descr-cleanup

[Minor] unify rule scores and weights and improve descriptions

diff --cc conf/scores.d/rbl_group.conf
index 5912e82755036b24911196b276a90b249cfb482a,a8fdc2a423bf7f75cfc1444c04882af1131ad3b9..39e77dc4a9c0ec812890ad7cdffd835359795b85
--- 1/conf/scores.d/rbl_group.conf
--- 2/conf/scores.d/rbl_group.conf
+++ b/conf/scores.d/rbl_group.conf
@@@ -61,17 -53,14 +61,17 @@@ symbols = 
      "DWL_DNSWL_NONE" {
          weight = 0.0;
          description = "Message has a valid dkim signature originated from domain listed at https://www.dnswl.org, no trust";
 +        groups = ["dnswl"];
      }
      "DWL_DNSWL_LOW" {
-         weight = -1;
+         weight = -1.0;
          description = "Message has a valid dkim signature originated from domain listed at https://www.dnswl.org, low trust";
 +        groups = ["dnswl"];
      }
      "DWL_DNSWL_MED" {
-         weight = -2;
+         weight = -2.0;
          description = "Message has a valid dkim signature originated from domain listed at https://www.dnswl.org, medium trust";
 +        groups = ["dnswl"];
      }
      "DWL_DNSWL_HI" {
          weight = -3.5;

diff --cc conf/scores.d/surbl_group.conf
index 22b8dba71fccb854501aae3f4ceac4e9322cb114,76fb71f40c71ea158dab84f5d6f0e9232af517a3..9b56e710994c752342d45e724a70e11b2bf096ab
--- 1/conf/scores.d/surbl_group.conf
--- 2/conf/scores.d/surbl_group.conf
+++ b/conf/scores.d/surbl_group.conf
@@@ -142,12 -120,10 +142,12 @@@ symbols = 
      "DBL_ABUSE_BOTNET" {
          weight = 5.5;
          description = "DBL uribl abused legit botnet C&C";
 +        groups = ["spamhaus"];
      }
      "DBL_PROHIBIT" {
-         weight = 0.00000;
+         weight = 0.0;
          description = "DBL uribl IP queries prohibited!";
 +        groups = ["spamhaus"];
      }
      "URIBL_MULTI" {
          weight = 0.0;

diff --cc rules/misc.lua
Simple merge