You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by qu...@apache.org on 2004/02/26 05:25:27 UTC

svn commit: rev 6861 - in incubator/spamassassin/trunk: rules t t/data/spam

Author: quinlan
Date: Wed Feb 25 20:25:25 2004
New Revision: 6861

Modified:
   incubator/spamassassin/trunk/rules/20_body_tests.cf
   incubator/spamassassin/trunk/rules/20_html_tests.cf
   incubator/spamassassin/trunk/rules/20_phrases.cf
   incubator/spamassassin/trunk/rules/20_porn.cf
   incubator/spamassassin/trunk/rules/30_text_de.cf
   incubator/spamassassin/trunk/rules/30_text_fr.cf
   incubator/spamassassin/trunk/rules/50_scores.cf
   incubator/spamassassin/trunk/rules/regression_tests.cf
   incubator/spamassassin/trunk/t/data/spam/011
   incubator/spamassassin/trunk/t/html_obfu.t
   incubator/spamassassin/trunk/t/spam.t
Log:
remove low performing rawbody and body rules based on nightly corpus
results, not including userconf rules


Modified: incubator/spamassassin/trunk/rules/20_body_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_body_tests.cf	(original)
+++ incubator/spamassassin/trunk/rules/20_body_tests.cf	Wed Feb 25 20:25:25 2004
@@ -74,43 +74,11 @@
 describe PYZOR_CHECK	Listed in Pyzor (http://pyzor.sf.net/)
 tflags PYZOR_CHECK	net
 
-###########################################################################
-
-body REMOVE_IN_QUOTES		/\"remove\"/i
-describe REMOVE_IN_QUOTES	List removal information
-
-body     __BILL_1618    /\D301\D+a\W*2\W*c\D+1618\D/i
-
-meta     ANTISPAM_BILL  REMOVE_IN_QUOTES && __BILL_1618
-describe ANTISPAM_BILL  Very likely mention of anti-spam bill
-
-###########################################################################
-# CLICK rules
-# note HTML_LINK_CLICK* rules in HTML parser section
-
-body CLICK_TO_REMOVE_2		/mailto:.{0,50}click.{0,50}remove/is
-describe CLICK_TO_REMOVE_2	Click-to-remove with mailto: found
-
-# fixed by ms to not allow entry field onto next line
-rawbody ASCII_FORM_ENTRY	/[^<][A-Za-z][A-Za-z]+.{1,15}?[\x09\x20]*_{30,}/
-describe ASCII_FORM_ENTRY	Contains an ASCII-formatted form
-
 # this seems to be the new fashion (as of Jul 5 2002).  base64-encoded parts need to
 # be stripped before this match
 body TRACKER_ID		/^[a-z0-9]{6,24}[-_a-z0-9]{12,36}[a-z0-9]{6,24}\s*\z/is
 describe TRACKER_ID	Incorporates a tracking ID number
 
-# heh heh heh... tags used to (presumably) generate those anti-Razor random
-# IDs.  Used by Send-Safe ratware, http://www.send-safe.com/
-body MARKUP_RAND                /\{%RAND%\}/
-describe MARKUP_RAND            RAND found, spammer tried to use a random-ID
-body MARKUP_SSPL                /SSPLTM/
-describe MARKUP_SSPL            SSPL found, spammer tried to use a random-ID
-
-# (contrib: Matt Sergeant)
-body LARGE_HEX  		/[0-9a-fA-F]{70,}/
-describe LARGE_HEX		Contains a large block of hexadecimal code
-
 # converted to use eval method by Matthew Cline
 body LINES_OF_YELLING		eval:check_for_yelling()
 describe LINES_OF_YELLING       A WHOLE LINE OF YELLING DETECTED
@@ -203,11 +171,11 @@
 
 body CHARSET_FARAWAY		eval:check_for_faraway_charset()
 describe CHARSET_FARAWAY	Character set indicates a foreign language
-tflags CHARSET_FARAWAY          userconf
+tflags CHARSET_FARAWAY		userconf
 
-body UNWANTED_LANGUAGE_BODY		eval:check_language()
+body UNWANTED_LANGUAGE_BODY	eval:check_language()
 describe UNWANTED_LANGUAGE_BODY	Message written in an undesired language
-tflags UNWANTED_LANGUAGE_BODY          userconf
+tflags UNWANTED_LANGUAGE_BODY	userconf
 
 body BODY_8BITS			eval:check_for_body_8bits()
 describe BODY_8BITS		Body includes 8 consecutive 8-bit characters

Modified: incubator/spamassassin/trunk/rules/20_html_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_html_tests.cf	(original)
+++ incubator/spamassassin/trunk/rules/20_html_tests.cf	Wed Feb 25 20:25:25 2004
@@ -355,13 +355,6 @@
 ###########################################################################
 # rawbody HTML tests
 
-rawbody SPAM_FORM		/CHANGE EMAIL ADDRESS IN ACTION OF FORM/
-describe SPAM_FORM		Form for changing email address
-rawbody SPAM_FORM_RETURN	/return validate_form/
-describe SPAM_FORM_RETURN	Form for checking email address
-rawbody SPAM_FORM_ACTION	/action="\&\#\d+;\&\#\d+;\&\#\d+;\&\#\d+;/i
-describe SPAM_FORM_ACTION	Obfuscated action attribute in HTML form
-
 rawbody HIDE_WIN_STATUS		/<[^>]+onMouseOver=[^>]+window\.status=/i
 describe HIDE_WIN_STATUS	Javascript to hide URLs in browser
 

Modified: incubator/spamassassin/trunk/rules/20_phrases.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_phrases.cf	(original)
+++ incubator/spamassassin/trunk/rules/20_phrases.cf	Wed Feb 25 20:25:25 2004
@@ -36,21 +36,12 @@
 describe SUBJ_REMOVE		List removal information
 body REPLY_REMOVE_SUBJECT	/reply.{1,15}remove.{1,15}subject/i
 describe REPLY_REMOVE_SUBJECT	List removal information
-body DISCONTINUE		/\"discontinue\".{1,15}no further notices/i
-describe DISCONTINUE		List removal information
 body REMOVE_FROM_LIST		/to be removed from (?:the|my|our) (?:mailing|e.?mail|opt[ -]?in)? ?list/i
 describe REMOVE_FROM_LIST	To be removed from list
 
 body REMOVE_REMOVAL_1WORD	/remov\S{0,64}remov/i
 describe REMOVE_REMOVAL_1WORD	List removal information
 
-body REMOVE_REMOVAL_2WORD	/remov\S{0,16}\s+\S{0,16}remov/i
-describe REMOVE_REMOVAL_2WORD	List removal information
-
-body __REMOVE_REMOVAL_NEAR	/remov(?:e|al).{0,16}remov(?:e|al)/i
-meta REMOVE_REMOVAL_NEAR	(__REMOVE_REMOVAL_NEAR && !REMOVE_REMOVAL_1WORD && !REMOVE_REMOVAL_2WORD)
-describe REMOVE_REMOVAL_NEAR	List removal information
-
 # bug 1022: MGM_POSTCARD #2 original
 body REMOVE_POSTAL		/(?:Send(?:ing|) a (?:postal mail|postcard) to (?:Unsubscribe|Customer ?Service|remove)|unsubscribe by (?:postal mail|postcard))/i
 describe REMOVE_POSTAL		Send real mail to be unsubscribed
@@ -73,14 +64,10 @@
 describe SENT_IN_COMPLIANCE	Claims compliance with spam regulations
 body BILL_1618			/Bill.{0,10}1618.{0,10}TITLE.{0,10}(?:III|\#3)/i
 describe BILL_1618		Claims compliance with Senate Bill 1618
-body S_1618			/S\..{0,10}1618.{0,10}-.{0,10}SECTION.{0,10}301/i
-describe S_1618			Claims compliance with Senate Bill 1618
 body UNDER_BILL_1618		/Under Bill s.?1618/i
 describe UNDER_BILL_1618	Claims compliance with Senate Bill 1618
 body SECTION_301		/SECTION.{0,10}301/i
 describe SECTION_301		Claims compliance with spam regulations
-body HR_4176			/H\.?R\.? *4176.{0,10}SECTION.{0,10}101/i
-describe HR_4176		Claims compliance with House Bill 4176
 body FURTHER_TRANSMISSIONS      /further transmissions to you by the sender/i
 describe FURTHER_TRANSMISSIONS  Claims compliance with spam regulations
 
@@ -126,14 +113,8 @@
 describe OPT_OUT_CAPS		Talks about opting out (capitalized version)
 body DIRECT_EMAIL		/direct e-*mail\b/i
 describe DIRECT_EMAIL		Talks about direct email
-body MASS_EMAIL			/mass e-*mail/i
-describe MASS_EMAIL		Talks about mass email
 body EMAIL_MARKETING		/e-*mail marketing/i
 describe EMAIL_MARKETING	Talks about email marketing
-body PRODUCED_AND_SENT_OUT	/This a.?d is produced and sent out by/i
-describe PRODUCED_AND_SENT_OUT	Tells you it's an ad
-body INCREASE_SOMETHING		/\b(?:boost|increase|grow|larger|bigger|higher) (?:traffic|sales)\b/i
-describe INCREASE_SOMETHING	Instructions on how to increase something
 
 body NEVER_ANOTHER		/never receive another mailing/i
 describe NEVER_ANOTHER		"another mailing" will "never" be "received"
@@ -150,8 +131,6 @@
 
 body EXCUSE_1			/\b(?:You (?:were sent|have received|are receiving)|You're receiving).{0,15}(?:message|e-?mail)s? because/i
 describe EXCUSE_1		Gives a lame excuse about why spam was sent
-body EXCUSE_2			/If you did not opt.in/i
-describe EXCUSE_2		Claims you actually asked for this spam
 body EXCUSE_3			/to (?:be removed|be deleted|no longer receive th(?:is|ese) messages?) (?:from|send|reply|[e-]*mail)/i
 describe EXCUSE_3		Claims you can be removed from the list
 body EXCUSE_4			/To Be Removed,? Please/i
@@ -180,13 +159,9 @@
 describe EXCUSE_15		Claims to be legitimate email
 body EXCUSE_16			/received this.{1,10}in error/i
 describe EXCUSE_16		I wonder how many emails they sent in error
-body EXCUSE_18			/we do not (?:spam|send unsolicited)/i
-describe EXCUSE_18		Claims not to be spam
 
 body EXCUSE_19			/because (?:you're|you (?:are )?)(?:registered|.{0,20}\bopt.{0,3}in)/i
 describe EXCUSE_19		Claims you opted-in or registered
-body EXCUSE_20			/you registered at one of our/i
-describe EXCUSE_20		Claims you registered at their site
 body EXCUSE_21			/your e.?mail address was obtained/i
 describe EXCUSE_21		Claims address was obtained legitimately
 body EXCUSE_22			/you are receiving this special offer/i
@@ -203,9 +178,6 @@
 body VIAGRA			/VIAGRA/
 describe VIAGRA			Plugs Viagra
 
-body NATURAL_VIAGRA             /\bnatural viagra\b/i
-describe NATURAL_VIAGRA         Plugs "Natural Viagra"
-
 # NB: Made it also match "Herbal V" - a viagra alternative
 body HERBAL_VIAGRA              /\bherbal v(?:iagra)?\b/i
 describe HERBAL_VIAGRA          Plugs "Herbal Viagra"
@@ -223,14 +195,9 @@
 
 # Jul  2 2002 jm: note that CommuniGate is *not* spam software, it's totally legit.
 # but beginning spammers often download a trial version and spam with it.
-body COMMUNIGATE		/transferred with a trial version of CommuniGate/
-describe COMMUNIGATE		Sent using a trial version of CommuniGate
 
 body OPPORTUNITY		/OPPORTUNITY/
 describe OPPORTUNITY		Gives information about an opportunity
-body PURE_PROFIT		/PURE PROFIT/i
-# this used to say 'Profit is dirty, not pure', but that's a bit extreme ;)
-describe PURE_PROFIT		Offers "pure" profit
 body STOCK_PICK			/STOCK PICK/i
 describe STOCK_PICK		Offers a picked stock
 body STOCK_ALERT		/stock alert/i
@@ -247,10 +214,6 @@
 describe SELECTED_YOU		They have selected you for something
 
 # (contrib: skod)
-body PRINT_FORM_SIGNATURE	/Sign(?:ature)?\s*(?:here|please)?:.{0,30}___*/i
-describe PRINT_FORM_SIGNATURE	Asks you for your signature on a form
-
-# (contrib: skod)
 body MAIL_IN_ORDER_FORM		/\b(?:Mail-in|secure|ez|credit.card|fax this) Order Form\b/i
 describe MAIL_IN_ORDER_FORM	Contains mail-in order form
 
@@ -265,9 +228,6 @@
 body PREST_NON_ACCREDITED	/prestigi?ous\b.{0,20}\bnon-accredited\b.{0,20}\buniversities/i
 describe PREST_NON_ACCREDITED	'Prestigious Non-Accredited Universities'
 
-body DOMAIN_BODY		/(?:\s|^)(?:\.|dot\s+)(?:info|biz|name)\b|(?:\s|^)\.\w+ domain/mi
-describe DOMAIN_BODY		Domain registration spam body
-
 body REMOVAL_INSTRUCTIONS	/\b(?:REMOVAL|UNSUBSCRIBE) INSTRUCTIONS/i
 describe REMOVAL_INSTRUCTIONS	Gives instructions for removal from list
 
@@ -316,21 +276,9 @@
 body MORTGAGE_NETWORK           /will be transmitted to our network of mortgage specialists/i
 describe MORTGAGE_NETWORK       Something about a mortgage network
 
-body HELPED_FINANCE             /you helped me finance a new home and I got a very good deal/i
-describe HELPED_FINANCE         A dodgy mortgage testimonial
-
-body FALLING_INTEREST           /falling interest/i
-describe FALLING_INTEREST	Interest rates
-
 body ORDER_REPORT               /order report .\s?\d from/i
 describe ORDER_REPORT           Order a report from someone
-
-body TAKE_ACTION_NOW		/take action now!/i
-describe TAKE_ACTION_NOW	Tells you to 'take action now!'
-
-body THE_FOLLOWING_FORM		/the following form\b/i
-describe THE_FOLLOWING_FORM	Asks you to fill out a form
-
+				    
 # this works best as rawbody
 # do not add "subscribe", "unsubscribe", or "help"
 rawbody MAILTO_SUBJ_REMOVE		/mailto:.{0,64}\@.{0,64}\?subject=(?:\"|3D)*(?:remove?|delete|please.?(?:delete|remove|unsubscribe)|abuse|off\b|stop|take.?me.?off)/i
@@ -360,25 +308,9 @@
 rawbody FRONTPAGE		/FrontPage.Editor/
 describe FRONTPAGE		Frontpage used to create the message
 
-# some very frequent spam subjects, based on statistical analysis
-body KIFF			/temple kiff/i
-describe KIFF			Contains "Temple Kiff"
-
-body CBYI			/CBYI/
-describe CBYI			Contains "CBYI"
-
 body JODY			/\b(?:My wife|Mi esposa), Jody/
 describe JODY			Contains "My wife, Jody" testimonial
 
-body GENTLE_FEROCITY		/Gentle Ferocity/i
-describe GENTLE_FEROCITY	Contains "Gentle Ferocity"
-
-body VJESTIKA			/Vjestika Aphrodisia/i
-describe VJESTIKA		Contains "Vjestika Aphrodisia"
-
-body TONER			/\b(?:toner|ink(?:[-\s]*jet)?|fax|copier)[-\s]+cartridge/i
-describe TONER			Contains "Toner Cartridge"
-
 body YOUR_INCOME		/\byour income\b/i
 describe YOUR_INCOME		Doing something with my income
 
@@ -481,15 +413,9 @@
 body OFFER			/\b(?:free|special|trial) offer/i
 describe OFFER			Free Offer
 
-body FREE_QUOTE		        /\bfree quote/i
-describe FREE_QUOTE		Free Quote
-
 body FREE_QUOTE_INSTANT		/free.{0,12}(?:(?:instant|express|online|no.?obligation).{0,4})+.{0,32}\bquote/i
 describe FREE_QUOTE_INSTANT	Free express or no-obligation quote
 
-body FREE_DVD		        /\bfree dvd/i
-describe FREE_DVD		Free DVD
-
 body FREE_INVESTMENT	        /\bfree investment/i
 describe FREE_INVESTMENT	Free Investment
 
@@ -511,9 +437,6 @@
 body BANKRUPTCY		        /\b(?:avoid|past) bankruptcy\b/i
 describe BANKRUPTCY		Avoid Bankruptcy
 
-body CREDIT_BUREAU	        /\ball .{0,9}credit bureaus?\b/i
-describe CREDIT_BUREAU		Credit Bureaus
-
 body ACCEPT_CREDIT_CARDS	/\b(?:accept\b|are accepting).{1,15}credit cards?\b/i
 describe ACCEPT_CREDIT_CARDS	Accept Credit Cards
 
@@ -547,27 +470,18 @@
 body REFINANCE_NOW              /time to refinance|refinanc\w{1,3}\b.{0,16}\bnow\b/i
 describe REFINANCE_NOW          Home refinancing
 
-body SEARCH_ENGINE_PROMO        /\b(?:(?:submitt?|list)(?:ed|ing|s)?|place(?:d|ment))\b.{1,30}\b(?:in|to)[\s_-]+.{0,30}\b(?:search(?:ing)?\s*(?:engine|site)|director(?:y|ie))s?\b/is
-describe SEARCH_ENGINE_PROMO    Discusses search engine listings
-
 body OPPORTUNITY_2		/\b(?:opportunity (?:pass|of a lifetime|is knocking|for you)|(?:investment|unique) opportunity)\b/i
 describe OPPORTUNITY_2		Opportunity - What a deal!
 
 body NO_PURCHASE	        /\bno purchase\b/i
 describe NO_PURCHASE		No Purchase Necessary
 
-body NO_STRINGS		        /\bno strings attached\b/i
-describe NO_STRINGS		No Strings Attached
-
 body NO_FEE		        /\bno .{0,12}fees?\b/i
 describe NO_FEE			No Fees
 
 body NO_MEDICAL		        /\bno medical exam/i
 describe NO_MEDICAL		No Medical Exams
 
-body NO_AGE		        /\bno age (?:restriction|limit)/i
-describe NO_AGE			No Age Restrictions
-
 body NO_FORMS		        /\bno .{0,9}forms\b/i
 describe NO_FORMS		No Claim Forms
 
@@ -595,12 +509,6 @@
 body WHY_WAIT		        /\b(?:why wait|what are you waiting for)\b/i
 describe WHY_WAIT		What are you waiting for
 
-body SUPPLIES_LIMITED	        /\bsupplies are limited\b/i
-describe SUPPLIES_LIMITED	Supplies are Limited
-
-body SECRET_RECORD	        /\bsecretly record/i
-describe SECRET_RECORD		Secretly Recorded
-
 body USE_IDENTITY		/someone using your identity/i
 describe USE_IDENTITY		Someone using your identity
 
@@ -619,9 +527,6 @@
 body MARKET_SOLUTION	        /\bmarket.{0,9} solution/i
 describe MARKET_SOLUTION	Marketing Solutions
 
-body MARKETING		        /\bdirect marketing\b/i
-describe MARKETING		Direct Marketing
-
 body SAVE_MONEY		        /\bsave .{0,9}(?:money|thousands|millions|up to)\b/i
 describe SAVE_MONEY		Save big money
 
@@ -646,9 +551,6 @@
 body CASH_BONUS		        /\bcash bonus\b/i
 describe CASH_BONUS		Cash Bonus
 
-body SHOPPING_SPREE	        /\bshopping spree\b/i
-describe SHOPPING_SPREE		Shopping Spree
-
 body FANTASTIC		        /\bfantastic {0,9}(?:price|deal|saving)/i
 describe FANTASTIC		Fantastic Deal
 
@@ -671,9 +573,6 @@
 body CABLE_CONVERTER	        /\bcable (?:converter|descrambler)/i
 describe CABLE_CONVERTER	Cable Converter
 
-body LUXURY_CAR		        /\bluxury car\b/i
-describe LUXURY_CAR		Luxury Car
-
 body WRINKLES		        /\bwrinkle reduction\b/i
 describe WRINKLES		Removes Wrinkles
 
@@ -722,9 +621,6 @@
 body SATISFACTION		/\bsatisfaction .{0,9}g(?:ua|au)ranteed\b/i
 describe SATISFACTION		Satisfaction Guaranteed
 
-body PRIZE		        /\bclaim.{0,9} prize/i
-describe PRIZE			Talks about prizes
-
 # Avoid an FP noted by NISHIJIMA Takanori: 'Japanese string sequence:
 # "Su" "Ku" "Na"  "I" "Ko" "Su" "To" "De" "Yo" "Ri" ...
 # (This string means, "More ...(ex. "productive" or "effective")
@@ -736,9 +632,6 @@
 meta HG_HORMONE			(!__ISO_2022_JP_DELIM && __HG_HORMONE)
 describe HG_HORMONE		Talks about hormones for human growth
 
-body EASY_TERMS		        /\beasy terms\b/i
-describe EASY_TERMS		Easy Terms
-
 body EXTRA_CASH		        /\bextra cash\b/i
 describe EXTRA_CASH		Offers Extra Cash
 
@@ -778,9 +671,6 @@
 body SERIOUS_CASH	        /\bserious cash\b/i
 describe SERIOUS_CASH		Serious cash
 
-body CHILD_SUPPORT              /\buncollected child support\b/i
-describe CHILD_SUPPORT          "Collect Child Support" Scam
-
 body ITS_LEGAL                  /\b(?:perfectly|absolutely|100%|totally) legal\b/i
 describe ITS_LEGAL              Claims to be Legal
 
@@ -828,8 +718,6 @@
 describe FREE_PREVIEW		Free Preview
 
 # http://www.hughes-family.org/bugzilla/show_bug.cgi?id=678
-body USER_4U2                   /\b\S{0,20}(?:[^0-9][42](?:yo)?u|for-*you)(?:[.-]\S{1,20})?\@\S{1,20}\.(?:net|com|org|info)\b/
-describe USER_4U2               Local part containing a "4u" variant
 body DOMAIN_4U2                 /[\@\.]\S{0,20}(?:[^0-9][42](?:yo)?u|for-*you)(?:[.-]\S{1,20})?\.(?:net|com|org|info)\b/
 describe DOMAIN_4U2             Domain name containing a "4u" variant
 
@@ -845,29 +733,16 @@
 body LOW_PRICE                  /\blow.{0,4} (?-i:P)rice/i
 describe LOW_PRICE              Lowest Price
 
-body     EJACULATION            /\b(?:increase|improve|greater).{0,10}ejaculation/i
-describe EJACULATION            Increase your ejaculation!
-
 body TRACE_BY_SSN               /Trace anyone by social security number/i
 describe TRACE_BY_SSN           Talks about tracing by SSN
-body AUTO_EMAIL_REMOVAL         /Auto Email Removal/
-describe AUTO_EMAIL_REMOVAL     Claims auto-email removal
 body ONCE_IN_LIFETIME           /once in a lifetime opportunity/i
 describe ONCE_IN_LIFETIME       Once in a lifetime, apparently
 rawbody SAFEGUARD_NOTICE        /This safeguard is not inserted when using the registered version/s
 describe SAFEGUARD_NOTICE       Contains signature of unregistered spam tool
-body MORE_TRAFFIC               /\bmore (?:internet|web) traffic\b/i
-describe MORE_TRAFFIC           More Internet Traffic
 body NO_MIDDLEMAN               /\bno middleman\b/i
 describe NO_MIDDLEMAN           No Middleman
-body PHONE_CANCER               /\bphone.{0,15}cancer\b/i
-describe PHONE_CANCER           Cell Phone Cancer Scam
 body UNCLAIMED_MONEY            /\bunclaimed (?:funds|money|prizes?|rewards?)\b/i
 describe UNCLAIMED_MONEY        People just leave money laying around
-rawbody SPAM_FORM_INPUT         /<input name=.{0,5}submit.{0,99} Submit By E-Mail /i
-describe SPAM_FORM_INPUT        Form for verifying email address
-body INTL_EXEC_GUILD            /International Executive Guild/
-describe INTL_EXEC_GUILD        Well known spam senders
 
 body CHANGE_TERMS               /\bstrictly based on the following terms and conditions\b/i
 describe CHANGE_TERMS           Terms and conditions
@@ -875,24 +750,12 @@
 body     DONT_DELETE            /\b(?:don'?t delete this|do not delete)/i
 describe DONT_DELETE            Don't delete me!  Nooooo!!!!
 
-body EXCUSE_8                   /requests to be taken off our mailing list/i
-describe EXCUSE_8               Claims you can be removed from the list
-
-body INCREDIBLE                 /\bincredible secrets\b/i
-describe INCREDIBLE             Things incredible
-
 body NO_SELLING                 /absolutely NO selling/i
 describe NO_SELLING             Claims not to be selling anything
 
-body PSYCHIC                    /\b(?:caring|gifted|experienced) psychic/i
-describe PSYCHIC                Psychics Scam
-
 body WEALTH                     /\bachieve .{0,15}wealth\b/i
 describe WEALTH                 Achieve Wealth
 
-rawbody MONSTERHUT              /monsterhut.com/
-describe MONSTERHUT             Mentions monsterhut.com
-
 rawbody MURKOWSKI_CRUFT         /www\.senate\.gov\/~?murkowski/
 describe MURKOWSKI_CRUFT        Old Murkowski disclaimer
 
@@ -908,18 +771,9 @@
 body OUR_COMPENSATION           /our (?:full )?compensation/i
 describe OUR_COMPENSATION	Mentions their full compensation
 
-body OVERWHELMING_GROWTH		/our overwhelming growth/i
-describe OVERWHELMING_GROWTH	Mentions their overwhelming growth
-
 body OUR_STRICT_ANTI		/our strict anti/i
 describe OUR_STRICT_ANTI	Mentions their strict antipathy on something
 
-body OUR_PUBLICATIONS		/our website (?:and|or) publications/i
-describe OUR_PUBLICATIONS	Mentions their website and/or publications
-
-body OUR_PRIVACY_POLICY         /our privacy policy can be found/i
-describe OUR_PRIVACY_POLICY 	Mentions where their privacy policy is
-
 body CELL_PHONE_BOOST		/\b(?:(?:boost|antenna|reception).{0,16}(?:cell|mobile|phone|cord.?less)|(?:cell|mobile|phone|cord.?less).{0,16}(?:boost|antenna|reception))/i
 describe CELL_PHONE_BOOST	Talks about cell-phone signal improvement
 
@@ -948,10 +802,6 @@
 describe START_NOW_CAPS 	Talks about 'starting now' with capitals
 body WORRY_FREE                 /worry free/i
 describe WORRY_FREE             No Worries, Mate
-body EXPERTS_SHOW_HOW           /experts show you how/i
-describe EXPERTS_SHOW_HOW       Talks about 'experts' showing you how
-body ENHANCE_WEBSITE            /E(?i:nhance any) W(?i:ebsite)/
-describe ENHANCE_WEBSITE        Talks about 'enhancing any website'
 body INCREASE_SEX               /increased?.{0,9}(?:sex|stamina)/i
 describe INCREASE_SEX 		Talks about a bigger drive for sex
 
@@ -966,9 +816,6 @@
 body	UP_TO_OR_MORES		/up to \S+(?: \S+)? or more/i
 describe UP_TO_OR_MORES		Has generic 'up to X or more' noise
 
-body VERB_UP_TO_OR_MORES	/\b(?:add|lose|make|save) up to \S+(?: \S+)? or more/i
-describe VERB_UP_TO_OR_MORES	Has add/lose/make/save up to X or more
-
 # Feb 18 2003 jm: another Nigerian scam phrase
 body NIGERIAN_SCAM_VIRTUE	/by virtue of its nature as being utterly confidential/i
 describe NIGERIAN_SCAM_VIRTUE	Possible Nigerian Scam Text
@@ -995,7 +842,6 @@
 
 body		GENERIC_VIAGRA	/Generic Viagra/
 describe	GENERIC_VIAGRA	Mentions Generic Viagra
-
 
 body SEE_FOR_YOURSELF		/See (?:for|it|it for) yourself\b/i
 describe SEE_FOR_YOURSELF       See for yourself 

Modified: incubator/spamassassin/trunk/rules/20_porn.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_porn.cf	(original)
+++ incubator/spamassassin/trunk/rules/20_porn.cf	Wed Feb 25 20:25:25 2004
@@ -30,9 +30,6 @@
 
 ###########################################################################
 
-body LARGE_COLLECTION           /\b(?:[0-9,]{5,9}|hundreds|thousands|millions|tons)\b.{0,15}(?:movies|videos?|xxx|streaming|pics?|photos?|of live|of images)\b/i
-describe LARGE_COLLECTION       Possible porn - Large Number of movies, pics
-
 body FREE_PORN                  /\bfree (?:porn|xxx|adult)/i
 describe FREE_PORN              Possible porn - Free Porn
 
@@ -82,24 +79,8 @@
 body MUST_BE_18                 /\bmust be (?:at least|over) 18\b/i
 describe MUST_BE_18             Possible porn - Must be 18
 
-body RAPE                       /\b(?:virgin|gang|teen|amateur) rape|\brape (?:sites?|sex)\b/i
-describe RAPE                   Possible porn - Rape
-
 body LESBIAN                    /\b(?:xxx|horny|hot|young) lesbian|lesbian (?:sites?|action|bitch)/i
 describe LESBIAN                Possible porn - Lesbian Site
-
-body  PORN_PASSWORD             /\bporn password/i
-describe PORN_PASSWORD          Possible porn - Porn Password
-
-# (contrib: skod)
-body PORN_6			/\b(?:\d+\+? xxx pictures|xxx photos?)\b/i
-describe PORN_6			Possible Porn - XXX Photos
-
-body PORN_MEMBERSHIP            /\b(?:vip|adult|porn|x.rated) membership/i
-describe PORN_MEMBERSHIP        Possible Porn - Porn membership
-
-body PORN_GALLERIES             /\bhuge galleries\b/i
-describe PORN_GALLERIES         Possible porn - Galleries of Pictures
 
 body PORN_15			/(?=[celstwvy])(?:college|eating|licking|spears|tight|wet|shaved|voyeur|young|teen(?:age)?).{0,16}pussy/i
 describe PORN_15		Possible porn - various types of feline

Modified: incubator/spamassassin/trunk/rules/30_text_de.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/30_text_de.cf	(original)
+++ incubator/spamassassin/trunk/rules/30_text_de.cf	Wed Feb 25 20:25:25 2004
@@ -67,14 +67,7 @@
 lang de describe RAZOR2_CF_RANGE_51_100 Razor2 Spam-Bewertung liegt zwischen 51 und 100
 lang de describe DCC_CHECK Aufgelistet im DCC-System (http://rhyolite.com/anti-spam/dcc/)
 lang de describe PYZOR_CHECK Aufgelistet im Pyzor-System (http://pyzor.sf.net/)
-lang de describe REMOVE_IN_QUOTES Anleitung zur Entfernung aus einer Adressliste
-lang de describe ANTISPAM_BILL Erw�hnt h�chstwahrscheinlich US-Gesetzentwurf 1618 (Anti-Spam-Gesetz)
-lang de describe CLICK_TO_REMOVE_2 "Click-to-remove" in Verbindung mit "mailto:" gefunden
-lang de describe ASCII_FORM_ENTRY Enth�lt Formulardaten im ASCII-Format
 lang de describe TRACKER_ID Beinhaltet eine Identit�tsnummer zur Nutzerbeobachtung
-lang de describe MARKUP_RAND "RAND" gefunden, Spammer hat den Zufallsgenerator nicht gestartet
-lang de describe MARKUP_SSPL "SSPL" gefunden, Spammer hat den Zufallsgenerator nicht gestartet
-lang de describe LARGE_HEX Enth�lt einen gro�en Block von Hexadezimalzahlen
 lang de describe LINES_OF_YELLING EINE ZEILE MIT GESCHREI GEFUNDEN
 lang de describe LINES_OF_YELLING_2 ZWEI ZEILEN MIT GESCHREI GEFUNDEN
 lang de describe LINES_OF_YELLING_3 DREI ZEILEN MIT GESCHREI GEFUNDEN
@@ -447,9 +440,6 @@
 lang de describe HTML_CHARSET_FARAWAY Fremdsprachlicher Zeichensatz f�r HTML benutzt
 lang de describe HTML_MIME_NO_HTML_TAG Nachricht besteht nur aus HTML, hat aber kein "<html>"-Element
 lang de describe HTML_COMMENT_RATIO Nachricht besteht zu gro�em Prozentsatz aus HTML-Kommentaren
-lang de describe SPAM_FORM Formular zum �ndern der E-mail-Adresse
-lang de describe SPAM_FORM_RETURN Formular zur �berpr�fung der E-mail-Adresse
-lang de describe SPAM_FORM_ACTION verschleiertes Formular in HTML-Nachricht
 lang de describe HIDE_WIN_STATUS Javascript-Anweisungen verstecken Hyperlinks
 lang de describe LINK_TO_NO_SCHEME Hyperlink ohne "http://"
 lang de describe OBFUSCATING_COMMENT HTML-Kommentar versucht Text zu verschleiern
@@ -470,21 +460,16 @@
 lang de describe REMOVE_SUBJ Anleitung zur Entfernung aus der Adressliste
 lang de describe SUBJ_REMOVE Anleitung zur Entfernung aus der Adressliste
 lang de describe REPLY_REMOVE_SUBJECT Anleitung zur Entfernung aus der Adressliste
-lang de describe DISCONTINUE Anleitung zur Entfernung aus der Adressliste
 lang de describe REMOVE_FROM_LIST Anleitung zur Entfernung aus der Adressliste
 lang de describe REMOVE_REMOVAL_1WORD Anleitung zur Entfernung aus der Adressliste
-lang de describe REMOVE_REMOVAL_2WORD Anleitung zur Entfernung aus der Adressliste
-lang de describe REMOVE_REMOVAL_NEAR Anleitung zur Entfernung aus der Adressliste
 lang de describe REMOVE_POSTAL Senden Sie Brief/Postkarte um aus der Liste entfernt zu werden...
 lang de describe CLICK_BELOW_CAPS Aufforderung zum Mausklick in Gro�buchstaben
 lang de describe CLICK_BELOW Aufforderung zum Mausklick
 lang de describe CLICK_TO_REMOVE_1 Entfernung aus der Adresslist nur ein Mausklick entfernt
 lang de describe SENT_IN_COMPLIANCE Behauptet, den Vorschriften �ber Spam zu entsprechen
 lang de describe BILL_1618 Behauptet, dem US-Gesetzentwurf 1618 zu entsprechen
-lang de describe S_1618 Behauptet, dem US-Gesetzentwurf 1618 zu entsprechen
 lang de describe UNDER_BILL_1618 Behauptet, dem US-Gesetzentwurf 1618 zu entsprechen
 lang de describe SECTION_301 Behauptet, den Vorschriften �ber Spam zu entsprechen
-lang de describe HR_4176 Behauptet, dem US-Gesetzentwurf HR 4176 zu entsprechen
 lang de describe FURTHER_TRANSMISSIONS Behauptet, den Vorschriften �ber Spam zu entsprechen
 lang de describe GUARANTEE Enth�lt das Wort "GUARANTEE"
 lang de describe NO_QS_ASKED Stellt keine weiteren Fragen...
@@ -506,16 +491,12 @@
 lang de describe OPT_OUT Falls Sie nicht mitmachen wollen ...(opt-out)
 lang de describe OPT_OUT_CAPS Falls Sie nicht mitmachen wollen ...(Opt-Out)
 lang de describe DIRECT_EMAIL Erw�hnt direkte E-mail
-lang de describe MASS_EMAIL Erw�hnt Massenwerbung per E-mail
 lang de describe EMAIL_MARKETING Erw�hnt Marketing per E-Mail
-lang de describe PRODUCED_AND_SENT_OUT Gesteht von selbst, da� es Werbung ist
-lang de describe INCREASE_SOMETHING Wie Sie irgendetwas vergr��ern k�nnen
 lang de describe NEVER_ANOTHER Man wird Ihnen niemals wieder etwas schicken
 lang de describe ONE_TIME_MAILING "Einmalige Nachricht" sagt nicht, dass es kein Spam ist...
 lang de describe MILLION_EMAIL Besorgen Sie sich eine Million E-mail-Adressen
 lang de describe ADDRESSES_ON_CD Adressen auf CD sind nur f�r Spam n�tzlich
 lang de describe EXCUSE_1 Gibt eine dumme Entschuldigung f�r Spam an
-lang de describe EXCUSE_2 Behauptet, man habe Spam sogar selbst angefodert
 lang de describe EXCUSE_3 Behauptet, man k�nne sich von der Adressliste entfernen lassen
 lang de describe EXCUSE_4 Behauptet, man k�nne sich von der Adressliste entfernen lassen
 lang de describe EXCUSE_6 Behauptet, man k�nne sich von der Adressliste entfernen lassen
@@ -527,37 +508,30 @@
 lang de describe EXCUSE_14 Anleitung, wie man weiteren SPAM stoppen kann
 lang de describe EXCUSE_15 Behauptet, normale E-mail zu sein
 lang de describe EXCUSE_16 Wie viele E-mails wurden wohl irrt�mlich verschickt?
-lang de describe EXCUSE_18 Behauptet, kein Spam zu sein
 lang de describe EXCUSE_19 Sie haben angeblich zugestimmt oder sich irgendwo registrieren lassen
-lang de describe EXCUSE_20 Sie haben sich angeblich irgendwo registrieren lassen
 lang de describe EXCUSE_21 Angeblich wurde die Adresse legal erworben
 lang de describe EXCUSE_22 Es gibt einen Grund warum Sie dieses Angebot bekommen...
 lang de describe EXCUSE_23 Sie haben sich angeblich eine Erlaubnis erteilt
 lang de describe EXCUSE_24 Angeblich haben m�chten Sie diese Werbung bekommen
 lang de describe EXCUSE_REMOVE Beschreibt, wie Sie diese Nachrichten wieder loswerden
 lang de describe VIAGRA Wirbt f�r Viagra
-lang de describe NATURAL_VIAGRA Wirbt f�r nat�rliches Viagra
 lang de describe HERBAL_VIAGRA Wirbt f�r pflanzliches Viagra
 lang de describe TARGETED Gezielte Werbung per E-mail
 lang de describe LIMITED_TIME_ONLY Das Angebot ist zeitlich begrenzt
 lang de describe STRONG_BUY Erw�hnt eine starke Kaufempfehlung (von Aktien ?)
 lang de describe WE_HONOR_ALL Behauptet, Aufforderungen zur Entfernung von der Liste zu folgen
-lang de describe COMMUNIGATE Mit einer Testversion von CommuniGate verschickt
 lang de describe OPPORTUNITY Erw�hnt eine besondere Gelegenheit
-lang de describe PURE_PROFIT "Reiner Profit" ist oft ein Widerspruch in sich
 lang de describe STOCK_PICK Bietet eine Aktienempfehlung an
 lang de describe STOCK_ALERT Bietet eine Benachrichtigung �ber Aktienwerte an
 lang de describe MICRO_CAP_WARNING Warnung vor Billigaktien gem�� US-B�rsenaufsichtsbestimmungen
 lang de describe NOT_ADVISOR Dreht sich um einen nicht registrierten Investmentberater
 lang de describe SOME_BREAKTHROUGH Jemand hat den gro�en Durchbruch geschafft
 lang de describe SELECTED_YOU Sie wurden auserw�hlt
-lang de describe PRINT_FORM_SIGNATURE Aufforderung zur Unterschrift auf einem Formular
 lang de describe MAIL_IN_ORDER_FORM Enth�lt ein Formular zur schriftlichen Bestellung
 lang de describe INSTANT_ACCESS Bietet Ihnen sofortigen Zugang zu irgendetwas an
 lang de describe UNIVERSITY_DIPLOMAS Universit�tsdiplome schnell und einfach...
 lang de describe PREST_NON_ACCREDITED Kaufen Sie Studienabschl�sse obskurer Universit�ten
 lang de describe NEW_DOMAIN_EXTENSIONS Eventuell Spam bez�glich neuer Internet-Adressen
-lang de describe DOMAIN_BODY Nachrichtentext dreht sich um neue Internet-Adressen
 lang de describe REMOVAL_INSTRUCTIONS Anleitung zur Entfernung aus der Adressliste
 lang de describe CANNOT_BE_SPAM Angeblich kann dies auf keinen Fall Spam sein...
 lang de describe THIS_IS_AN_AD Nachricht sagt selbst, dass es sich um Werbung handelt.
@@ -572,11 +546,7 @@
 lang de describe MORTGAGE_RATES Informationen �ber Hypothekendarlehen
 lang de describe MORTGAGE_WAITING Dreht sich um Wartezeit auf Hypothekendarlehen
 lang de describe MORTGAGE_NETWORK Dreht sich um Spezialisten f�r Hypothekendarlehen
-lang de describe HELPED_FINANCE Dankschreiben angeblich zufriedener Kunden
-lang de describe FALLING_INTEREST fallende Zinsen
 lang de describe ORDER_REPORT Sie sollen einen Report bestellen
-lang de describe TAKE_ACTION_NOW Aufforderung sofort aktiv zu werden
-lang de describe THE_FOLLOWING_FORM Aufforderung, ein Formular auszuf�llen
 lang de describe MAILTO_SUBJ_REMOVE Hyperlink mit "mailto:" soll Sie von der Adressliste entfernen
 lang de describe MAILTO_LINK URL, der eine E-mail verschickt
 lang de describe AOL_USERS_LINK Enth�lt einen URL f�r AOL-Benutzer
@@ -585,12 +555,7 @@
 lang de describe US_DOLLARS_3 Erw�hnt Millonen von Dollar
 lang de describe MILLION_USD Erw�hnt Millonen von Dollar
 lang de describe FRONTPAGE Nachricht wurde vom Programm Frontpage erzeugt
-lang de describe KIFF Enth�lt "Temple Kiff"
-lang de describe CBYI Enth�lt "CBYI"
 lang de describe JODY Enth�lt "My wife, Jody"-Bericht
-lang de describe GENTLE_FEROCITY Enth�lt "Gentle Ferocity"
-lang de describe VJESTIKA Enth�lt "Vjestika Aphrodisia"
-lang de describe TONER Enth�lt "Toner Cartridge", vermutlich Werbung f�r Laserdruckerzubeh�r
 lang de describe YOUR_INCOME Steht in Zusammenhang mit Ihrem Verdienst
 lang de describe BE_AMAZED Sie werden erstaunt sein...
 lang de describe RESISTANCE_IS_FUTILE Widerstand gegen diesen Spam ist zwecklos...
@@ -622,9 +587,7 @@
 lang de describe RECEIVE_EMAIL Sie empfangen E-mail von dritter Seite
 lang de describe RECEIVE_OFFER Ein spezielles Angebot f�r Sie
 lang de describe OFFER Kostenloses / spezielles Angebot
-lang de describe FREE_QUOTE Kostenloses Preisangebot
 lang de describe FREE_QUOTE_INSTANT Kostenlos ein schnelles Preisangebot, ohne Verpflichtung
-lang de describe FREE_DVD Kostenlose DVD
 lang de describe FREE_INVESTMENT Kostenloses Investment f�r Sie
 lang de describe FREE_TRIAL Kostenlose Probe
 lang de describe FREE_MEMBERSHIP Kostenlose Mitgliedschaft
@@ -632,7 +595,6 @@
 lang de describe CREDIT_CARD Dreht sich um Kreditkarten
 lang de describe NO_CREDIT_CHECK Ohne Bonit�tspr�fung
 lang de describe BANKRUPTCY Vermeiden Sie den Bankrott
-lang de describe CREDIT_BUREAU Erw�hnt Kreditb�ros
 lang de describe ACCEPT_CREDIT_CARDS Kreditkarten werden akzeptiert
 lang de describe BAD_CREDIT Erw�hnt geplatzte Kredite oder Kreditw�rdigkeit
 lang de describe UNSECURED_CREDIT Erw�hnt ungesicherte Kredite
@@ -644,13 +606,10 @@
 lang de describe CREDITORS_CALLING Gl�ubiger stellen ihre Forderungen
 lang de describe REFINANCE_YOUR_HOME Dreht sich um Baufinanzierung
 lang de describe REFINANCE_NOW Dreht sich um Baufinanzierung
-lang de describe SEARCH_ENGINE_PROMO Bietet Eintragung in Websuchmaschinen an
 lang de describe OPPORTUNITY_2 Einmalige Gelegenheit
 lang de describe NO_PURCHASE Sie m�ssen nichts kaufen
-lang de describe NO_STRINGS An keine Bedingungen gekn�pft
 lang de describe NO_FEE Keine Kosten
 lang de describe NO_MEDICAL Keine medizinischen Examen n�tig
-lang de describe NO_AGE Keine Einschr�nkungen bez�glich des Alters
 lang de describe NO_FORMS Keine Formulare notwendig
 lang de describe NO_GIMMICK Kein Trick
 lang de describe NO_INVESTMENT Kein Investment
@@ -660,15 +619,12 @@
 lang de describe DRASTIC_REDUCED Drastisch reduziert
 lang de describe DO_IT_TODAY Machen Sie noch heute mit
 lang de describe WHY_WAIT Worauf warten Sie noch?
-lang de describe SUPPLIES_LIMITED Vorrat ist begrenzt
-lang de describe SECRET_RECORD Machen Sie heimliche Aufnahmen
 lang de describe USE_IDENTITY Jemand benutzt Ihre Identit�t
 lang de describe YOU_CAN_SEARCH Sie k�nnen sich nach jedermann erkundigen
 lang de describe FIND_ANYTHING Finden Sie alles heraus, was sie wollen
 lang de describe SEDUCTION Erfolg bei Frauen
 lang de describe INVALUABLE_MARKETING Unsch�tzbare Marketinginformationen
 lang de describe MARKET_SOLUTION L�sungen f�r Ihre Marketingprobleme
-lang de describe MARKETING Direktmarketing
 lang de describe SAVE_MONEY Sparen Sie viel Geld
 lang de describe GUARANTEED_STUFF Garantiertes Einkommen
 lang de describe INCOME Zusatzverdienst
@@ -677,7 +633,6 @@
 lang de describe WE_PROMISE_YOU Man macht Ihnen Versprechungen
 lang de describe AMAZING_STUFF Erstaunliche Dinge
 lang de describe CASH_BONUS Rabatt bei Barzahlung
-lang de describe SHOPPING_SPREE Einkaufstour
 lang de describe FANTASTIC fantastische Gelegenheit
 lang de describe CENTS_ON_DOLLAR Cents pro Dollar
 lang de describe DIET Reduzieren Sie Ihr Gewicht
@@ -685,7 +640,6 @@
 lang de describe REVERSE_AGING Halten Sie den Alterungsprozess auf
 lang de describe HAIR_LOSS Mittel gegen Haarausfall
 lang de describe CABLE_CONVERTER Konverter f�r Kabelfernsehen
-lang de describe LUXURY_CAR Erw�hnt Luxusautos
 lang de describe WRINKLES Mittel gegen Falten
 lang de describe BUY_JUDGEMENTS Wir kaufen gerichtlich erlassene Zahlungsaufforderungen
 lang de describe LYING_EYES Sie werden Ihren Augen nicht trauen
@@ -702,9 +656,7 @@
 lang de describe FINANCIAL Finanzielle Unabh�ngigkeit
 lang de describe FORWARD_LOOKING Enth�lt Formulierungen aus Aktienprospekten
 lang de describe SATISFACTION Garantierte Zufriedenheit
-lang de describe PRIZE Fordern Sie Ihren Gewinn an
 lang de describe HG_HORMONE Erw�hnt menschliche Wachstumshormone
-lang de describe EASY_TERMS G�nstige Vertragsbedingungen
 lang de describe EXTRA_CASH Zus�tzliches Geld
 lang de describe GET_PAID Lassen Sie sich bezahlen
 lang de describe BEEN_TURNED_DOWN Wurden Sie abgewiesen?
@@ -718,7 +670,6 @@
 lang de describe MLM Erw�hnt Betrug mit Pyramidensystemen
 lang de describe NOT_MLM Angeblich KEIN Betrug mit Pyramidensystemen
 lang de describe SERIOUS_CASH Ernstzunehmende Geldbetr�ge
-lang de describe CHILD_SUPPORT Betrug mit Kindergeld
 lang de describe ITS_LEGAL Die Sache ist v�llig legal...
 lang de describe FREE_GRANT Nehmen Sie Regierungsbeihilfen in Anspruch
 lang de describe VIAGRA_ONLINE Schnelle Lieferung von Viagra
@@ -735,40 +686,26 @@
 lang de describe APPLY_ONLINE Bewerben Sie sich �ber das Internet
 lang de describe FREE_INSTALL Enth�lt "free installation", mit Gro�buchstaben
 lang de describe FREE_PREVIEW Kostprobe gratis
-lang de describe USER_4U2 Englische Lautmalerei ("4u") im Benutzernamen
 lang de describe DOMAIN_4U2 Englische Lautmalerei ("4u") im Domainnamen
 lang de describe FREE_ACCESS Enth�lt "free access" mit Gro�buchstaben
 lang de describe FREE_SAMPLE Enth�lt "free sample" mit Gro�buchstaben
 lang de describe GET_IT_NOW Enth�lt "get it now" mit Gro�buchstaben
 lang de describe LOW_PRICE Niedrigste Preise
-lang de describe EJACULATION Vergr��ern Sie Ihre Ejakulation
 lang de describe TRACE_BY_SSN Nachforschungen mit Hilfe der Sozialversicherungsnummer
-lang de describe AUTO_EMAIL_REMOVAL Behauptet, automatische Entfernung von der Adressliste funktioniert
 lang de describe ONCE_IN_LIFETIME Eine solche Gelegenheit hat man nur einmal im Leben
 lang de describe SAFEGUARD_NOTICE Enth�lt Hinweis auf nicht registrierte Spam-Software
-lang de describe MORE_TRAFFIC Mehr Internetdatenverkehr
 lang de describe NO_MIDDLEMAN Kein Mittelsmann n�tig
-lang de describe PHONE_CANCER Betrug bzgl. Krebs durch Mobiltelefone
 lang de describe UNCLAIMED_MONEY Geld oder Gewinne ohne Besitzer
-lang de describe SPAM_FORM_INPUT Formular zur Best�tigung der E-mail-Adresse
-lang de describe INTL_EXEC_GUILD Bekannte Spam-Versender
 lang de describe CHANGE_TERMS Strikte Vertragsbedingungen
 lang de describe DONT_DELETE L�schen Sie diese Nachricht auf KEINEN Fall...
-lang de describe EXCUSE_8 Behauptet, man k�nne sich von der Adressliste entfernen lassen
-lang de describe INCREDIBLE Unglaubliche Dinge...
 lang de describe NO_SELLING Behauptet, nichts verkaufen zu wollen
-lang de describe PSYCHIC Betrug mit �bersinnlichen Wahrnehmungen
 lang de describe WEALTH Erwerben Sie Reichtum
-lang de describe MONSTERHUT Erw�hnt monsterhut.com
 lang de describe MURKOWSKI_CRUFT Alte Ausrede bzgl. Murkowski (US-Senator)
 lang de describe EARN_MONEY Verdienen Sie Geld
 lang de describe OBSCURED_EMAIL Eventuell ROT13-kodierte E-mail-Adresse im Text
 lang de describe OUR_AFFILIATE_PARTNERS Erw�hnt Partnerunternehmen
 lang de describe OUR_COMPENSATION Voller Schadenersatz
-lang de describe OVERWHELMING_GROWTH �berw�ltigendes Wachstum
 lang de describe OUR_STRICT_ANTI Starke Abneigung gegen irgendetwas
-lang de describe OUR_PUBLICATIONS Erw�hnt Webseiten oder andere Publikationen
-lang de describe OUR_PRIVACY_POLICY Es gibt eine firmeneigene Datenschutzpolitik
 lang de describe CELL_PHONE_BOOST Verbessert Funkqualit�t von Mobiltelefonen
 lang de describe OFFERS_ETC Angebote, Preisnachl�sse, Rabattkupons
 lang de describe BANG_BOSS Erw�hnt Ihren Chef, mit Ausrufezeichen
@@ -781,13 +718,10 @@
 lang de describe ACT_NOW_CAPS Reagieren Sie jetzt (in Gro�buchstaben)
 lang de describe START_NOW_CAPS Starten Sie jetzt (in Gro�buchstaben)
 lang de describe WORRY_FREE Seien Sie ohne Sorge
-lang de describe EXPERTS_SHOW_HOW Experten zeigen Ihnen, wie es geht
-lang de describe ENHANCE_WEBSITE So k�nnen Sie Ihre Webseiten verbessern
 lang de describe INCREASE_SEX Werden Sie sexuell aktiver
 lang de describe BANG_GUARANTEE Eine Garantie mit Ausrufezeichen
 lang de describe WE_HATE_SPAM2 Wir lehnen doch alle Spam ab...
 lang de describe UP_TO_OR_MORES Bis zu ... und mehr
-lang de describe VERB_UP_TO_OR_MORES Verdienen/sparen sie bis zu ... und mehr
 lang de describe NIGERIAN_SCAM_VIRTUE M�glicherweise Text mit nigerianischem Spam
 lang de describe NIGERIAN_BODY_GOVT_3 Nachrichtentext deutet auf nigerianischen Spam hin
 lang de describe WALAA "Voila", inkorrekt geschrieben
@@ -796,7 +730,6 @@
 lang de describe RAVAGESOFAGING Das Alter macht uns alle nicht j�nger...
 lang de describe GENERIC_VIAGRA Viagra als billiges Nachahmerpr�parat
 lang de describe BETTERMEMORY F�r ein besseres Ged�chtnis
-lang de describe LARGE_COLLECTION Eventuell Pornowerbung: gro�e Sammlung von Filmen/Bildern
 lang de describe FREE_PORN Eventuell Pornowerbung: Kostenlose Pornos
 lang de describe BARELY_LEGAL Eventuell Pornowerbung: knapp im erlaubten Alter
 lang de describe MEGA_SITE Eventuell Pornowerbung: Mega-Pornos
@@ -813,12 +746,7 @@
 lang de describe CELEBRITY_PORN Eventuell Pornowerbung: neugierig auf Prominente?
 lang de describe ADULT_SITE Eventuell Pornowerbung: Webseiten nur f�r Erwachsene
 lang de describe MUST_BE_18 Eventuell Pornowerbung: Sie m�ssen mindestens 18 sein
-lang de describe RAPE Eventuell Pornowerbung: Vergewaltigung
 lang de describe LESBIAN Eventuell Pornowerbung: Lesbischer Sex
-lang de describe PORN_PASSWORD Eventuell Pornowerbung: Sie brauchen ein Kennwort daf�r
-lang de describe PORN_6 Worte und Phrasen weisen auf Pornographie hin
-lang de describe PORN_MEMBERSHIP Eventuell Pornowerbung: Werden Sie Mitglied
-lang de describe PORN_GALLERIES Eventuell Pornowerbung: Bildersammlungen
 lang de describe PORN_15 Worte und Phrasen weisen auf Pornographie hin
 lang de describe PORN_16 Worte und Phrasen weisen auf Pornographie hin
 lang de describe LOTS_OF_STUFF Tausende/Millionen von Pornobildern

Modified: incubator/spamassassin/trunk/rules/30_text_fr.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/30_text_fr.cf	(original)
+++ incubator/spamassassin/trunk/rules/30_text_fr.cf	Wed Feb 25 20:25:25 2004
@@ -104,13 +104,10 @@
 lang fr describe ALL_NATURAL		Offre un produit "100% naturel"
 lang fr describe AMATEUR_PORN		Pornographie probable: "amateur porn"
 lang fr describe AMAZING_STUFF		Contient "Amazing Stuff"
-lang fr describe ANTISPAM_BILL		Mentionne tr�s probablement une loi anti-spam
 lang fr describe AOL_USERS_LINK		Contient un lien � cliquer pour les utilisateurs d'AOL
 lang fr describe APPLY_FREE		Contient "Free Application" (inscription/participation gratuite)
 lang fr describe APPLY_ONLINE           Contient "Apply Online" (inscrivez-vous en ligne, "O" majuscule)
-lang fr describe ASCII_FORM_ENTRY	Contient un formulaire de r�ponse mis en page en ASCII
 lang fr describe AS_SEEN_ON		Offre un produit "vu � la t�l�vision"
-lang fr describe AUTO_EMAIL_REMOVAL     Contient la formule "Auto Email Removal"
 lang fr describe AZOOGLE		Provient de azoogle.com, azogle.com, etc.
 lang fr describe BAD_CREDIT		Contient "Eliminate Bad Credit"
 lang fr describe BANG_BOSS        	Parle de votre "boss" avec point d'exclamation !
@@ -147,21 +144,17 @@
 lang fr describe CANNOT_BE_SPAM		Pr�tend que ce message "ne peut pas �tre consid�r� comme du spam" :-/
 lang fr describe CASHCASHCASH		Contient au moins trois symboles "$" successifs
 lang fr describe CASH_BONUS		Contient "Cash Bonus"
-lang fr describe CBYI			Contient le mot "CBYI"
 lang fr describe CELEBRITY_PORN		Pornographie probable "Celebrity Porn"
 lang fr describe CELL_PHONE_BOOST	Pr�tend am�liorer la r�ception des t�l�phones mobiles
 lang fr describe CENTS_ON_DOLLAR	Contient "Cents on the Dollar"
 lang fr describe CHANGE_TERMS           Parle de clauses "Terms and conditions"
 lang fr describe CHARSET_FARAWAY	Message utilisant un jeu de caract�res exotique
 lang fr describe CHARSET_FARAWAY_HEADER	En-t�te utilisant un jeu de caract�res exotique
-lang fr describe CHILD_SUPPORT          Escroquerie collectant des fonds "pour les enfants"
 lang fr describe CHINA_HEADER           Implique le domaine "china.com"
 lang fr describe CHINA_URL		URL chinoise fr�quemment trouv�e dans le spam
 lang fr describe CLICK_BELOW		Demande de cliquer ci-dessous
 lang fr describe CLICK_BELOW_CAPS	Demande de cliquer ci-dessous (majuscules)
 lang fr describe CLICK_TO_REMOVE_1	Contient "Click to be removed" (d�sabonnement)
-lang fr describe CLICK_TO_REMOVE_2      Contient "Click to be removed" (d�sabonnement)
-lang fr describe COMMUNIGATE		Provient du logiciel de spam CommuniGate
 lang fr describe COMPARE_RATES          Propose de comparer des taux "Compare Rates"
 lang fr describe COMPETE		Contient "Compete for your business"
 lang fr describe COMPLAIN_TO		Le message contient un en-t�te "Complain-To header"
@@ -171,7 +164,6 @@
 lang fr describe CONGRATULATIONS	"Congratulations", c'est une escroquerie
 lang fr describe CONSOLIDATE_DEBT	Consolidation de dettes, cr�dits ou factures
 lang fr describe COPY_ACCURATELY	Contient formule souvent pr�sente dans les cha�nes de lettres
-lang fr describe CREDIT_BUREAU		Parle de "bureau de cr�dit"
 lang fr describe CREDIT_CARD		Offre concernant des cartes de cr�dit
 lang fr describe CREDITORS_CALLING 	Contient "Calling Creditors"
 lang fr describe CUM_SHOT               Pornographie probable, "gros plans d'�jaculations"
@@ -198,11 +190,9 @@
 lang fr describe DIET			Spam proposant une perte de poids
 lang fr describe DIG_UP_INFO		Spam proposant de fouiller la vie priv�e de vos amis
 lang fr describe DIRECT_EMAIL		Contient la formule "direct email"
-lang fr describe DISCONTINUE		Informations pr�tendant vous permettre de vous retirer de la liste
 lang fr describe DISGUISE_PORN          Tente de d�guiser des termes pornographiques
 lang fr describe DNS_FROM_RFCI_DSN	Exp�diteur From: list� dans dsn.rfc-ignorant.org
 lang fr describe DOMAINS_CHEAP		Sujet: "Noms de domaines pas chers"
-lang fr describe DOMAIN_BODY		Propose la vente de noms de domaines Internet
 lang fr describe DOMAIN_SUBJECT		Le sujet fait r�f�rence aux nouveaux noms de domaine Internet
 lang fr describe DOMAIN_4U2             Nom de domaine contenant une variante de "4u"
 lang fr describe DONT_DELETE		Contient une formule incitant � ne pas effacer ce message
@@ -211,19 +201,14 @@
 lang fr describe EARNINGS		Contient "Potential Earnings" (gains potentiels)
 lang fr describe EARN_MONEY		Propose de gagner de l'argent
 lang fr describe EARN_PER_WEEK		Propose de gagner de l'argent chaque semaine
-lang fr describe EASY_TERMS		Contient "Easy Terms" (�ch�ances l�g�res)
-lang fr describe EJACULATION		Pr�tend augmenter l'�jaculation, Wow ;-)
 lang fr describe EMAIL_MARKETING        Contient la formule "email marketing"
 lang fr describe EMAIL_ROT13		Corps contient une adresse mail encod�e en ROT13
-lang fr describe ENHANCE_WEBSITE        Parle d'am�liorer n'importe quel site web "enhancing any website"
 lang fr describe EXCUSE_REMOVE		Explique comment �tre retir� des listes de mailing (soi-disant...)
 lang fr describe EXCUSE_1		Donne une fausse excuse pour l'envoi du message
-lang fr describe EXCUSE_2		Pr�tend que vous �tes d'accord pour recevoir ce SPAM
 lang fr describe EXCUSE_3		Pr�tend que vous pouvez vous faire supprimer de leur liste
 lang fr describe EXCUSE_4		Pr�tend que vous pouvez vous faire supprimer de leur liste
 lang fr describe EXCUSE_6		Pr�tend que vous pouvez vous faire supprimer de leur liste
 lang fr describe EXCUSE_7		Pr�tend que vous pouvez vous faire supprimer de leur liste
-lang fr describe EXCUSE_8               Pr�tend que vous pouvez vous faire supprimer de leur liste
 lang fr describe EXCUSE_10		Pr�tend que vous pouvez cesser de recevoir ces messages
 lang fr describe EXCUSE_11		Pr�tend que votre adresse figurait sur une liste l�gitime
 lang fr describe EXCUSE_12		Offre des excuses "si ce message vous a �t� envoy� par erreur"
@@ -231,14 +216,11 @@
 lang fr describe EXCUSE_14		Vous dit comment �viter (pr�tendument) d'autres SPAM
 lang fr describe EXCUSE_15		Pr�tend qu'il s'agit d'un message l�gitime
 lang fr describe EXCUSE_16		Offre des excuses "si ce message vous a �t� envoy� par erreur"
-lang fr describe EXCUSE_18		Pr�tend ne pas �tre du spam
 lang fr describe EXCUSE_19		Pr�tend que vous vous �tes volontairement inscrit ou enregistr�
-lang fr describe EXCUSE_20		Pr�tend que vous vous �tes enregistr� sur leur site
 lang fr describe EXCUSE_21		Pr�tend que votre adresse a �t� obtenue de mani�re l�gitime
 lang fr describe EXCUSE_22		Pr�tend que vous recevez cette offre pour une raison particuli�re
 lang fr describe EXCUSE_23		Pr�tend que vous avez autoris� l'envoi de ce message
 lang fr describe EXCUSE_24		Pr�tend que vous avez demand� � recevoir cette publicit�
-lang fr describe EXPERTS_SHOW_HOW       Parle de d�monstration/explication fournie par des "experts"
 lang fr describe EXTRA_CASH		Offre des gains suppl�mentaires
 lang fr describe EXTRA_MPART_TYPE	En-t�te "Content-type:...type=" surnum�raire
 lang fr describe E_MAILPROMO_URL	Lien vers un domaine probablement spammeur (e-mailpromo.net)
@@ -267,7 +249,6 @@
 lang fr describe FAKED_HOTMAIL_DAV	X-Originating-Email ne correspond pas � From
 lang fr describe FAKED_IP_IN_RCVD	L'en-t�te Received: contient une adresse IP falsifi�e
 lang fr describe FAKED_UNDISC_RECIPS	Mention 'Undisclosed-Recipients:' falsifi�e dans le "To:"
-lang fr describe FALLING_INTEREST	Parle de taux d'int�r�t "Interest rates"
 lang fr describe FANTASTIC		Parle de tr�s bonne affaire "Fantastic Deal"
 lang fr describe FINANCIAL 		Parle de "libert� financi�re" (Financial Freedom)
 lang fr describe FIND_ANYTHING		Vous propose de trouver des informations sur des gens
@@ -310,7 +291,6 @@
 lang fr describe FOR_JUST_SOME_AMT	Contient la formule "for only" une certaine somme d'argent
 lang fr describe FREE_ACCESS            Contient "free access" (acc�s gratuit) avec des majuscules
 lang fr describe FREE_CELL_PHONE 	Parle de t�l�phones mobiles gratuits
-lang fr describe FREE_DVD		Propose des DVD gratuits
 lang fr describe FREE_GRANT             Contient "Free Grant Money"
 lang fr describe FREE_INSTALL           Contient "free installation" (installation gratuite) avec majuscules
 lang fr describe FREE_INVESTMENT	Parle d'investissment libre "Free Investment"
@@ -319,7 +299,6 @@
 lang fr describe FREE_PASSWORD          Offre des "mots de passe gratuits" (souvent vol�s)
 lang fr describe FREE_PORN              Pornographie probable "Free porn"
 lang fr describe FREE_PREVIEW		Contient "Pr�visualisation gratuite" (Free Preview)
-lang fr describe FREE_QUOTE		Contient "Free Quote" (devis/estimation gratuit)
 lang fr describe FREE_QUOTE_INSTANT	Contient formule type "Free express" ou "no obligation"
 lang fr describe FREE_SAMPLE            Contient "free sample" (�chantillon gratuit) avec majuscules
 lang fr describe FREE_TRIAL		Contient "essai gratuit" (Free Trial)
@@ -344,7 +323,6 @@
 lang fr describe FULL_REFUND		Vous garantit un "remboursement int�gral" (en anglais)
 lang fr describe FURTHER_TRANSMISSIONS  Pr�tend �tre conforme aux r�glementations sur le spam
 lang fr describe GAPPY_SUBJECT		L'en-t�te Subject: contient du "t e x t e  e s p a c �"
-lang fr describe GENTLE_FEROCITY	Contient la formule "gentle ferocity"
 lang fr describe GET_IT_NOW		Contient "Get it now" (obtenez-le maintenant) avec majuscules
 lang fr describe GET_PAID		Contient "Get Paid" (soyez pay�)
 lang fr describe GET_STARTED_NOW	Contient "Get Started Now" (Commencez d�s maintenant)
@@ -359,7 +337,6 @@
 lang fr describe HARDCORE_PORN          Pornographie probable "Hardcore Porn"
 lang fr describe HEAD_ILLEGAL_CHARS	En-t�te contient trop de caract�res bruts invalides
 lang fr describe HEADER_COUNT_CTYPE	Plusieurs en-t�tes Content-Type
-lang fr describe HELPED_FINANCE         T�moignage bidon concernant un pr�t
 lang fr describe HERBAL_VIAGRA          Parle de pr�tendu "Herbal Viagra"
 lang fr describe HG_HORMONE		Parle d'hormone de croissance humaine
 lang fr describe HIDDEN_ASSETS          Parle d'actifs cach�s (hidden assets)
@@ -367,7 +344,6 @@
 lang fr describe HIDE_WIN_STATUS	Javascript destin� � camoufler une URL dans le navigateur
 lang fr describe HOME_EMPLOYMENT	Propose un travail � la maison
 lang fr describe HOT_NASTY		Pornographie probable: "Hot, Nasty, Wild, Young"
-lang fr describe HR_4176		Pr�tend �tre conforme au "House Bill 4176" (anti-spam)
 lang fr describe HTML_ALL_CAPS		L'en-t�te "Content type:" est "TEXT/HTML" en majuscules
 lang fr describe HTML_CHARSET_FARAWAY	Jeu de caract�res exotique utilis� pour le HTML
 lang fr describe HTML_COMMENT_EMAIL	Commentaire HTML contient une adresse e-mail
@@ -466,12 +442,9 @@
 lang fr describe IMPOTENCE		Pr�tend permettre de combattre l'impuissance
 lang fr describe INCOME			Contient "Additional Income" (revenu additionnel)
 lang fr describe INCREASE_SEX 		Parle d'augmenter le d�sir sexuel
-lang fr describe INCREDIBLE             Parle de choses incroyables :-/
-lang fr describe INCREASE_SOMETHING	Contient des instructions pour accroitre ventes ou trafic
 lang fr describe INITIAL_INVEST		Demande un investissement initial
 lang fr describe INSTANT_ACCESS         Pornographie probable - Propose un acc�s imm�diat
 lang fr describe INTL_DRIVERS_LICENSE	Parle de permis de conduire international
-lang fr describe INTL_EXEC_GUILD        Spammeur tristement c�l�bre
 lang fr describe INVALID_DATE		L'en-t�te Date: est incorrect (il contient AM/PM)
 lang fr describe INVALID_DATE_TZ_ABSURD	L'en-t�te Date: est incorrect (la zone de temps n'existe pas)
 lang fr describe INVALID_MSGID		Le Message-ID est invalide, selon la RFC-2822
@@ -482,10 +455,7 @@
 lang fr describe JAVASCRIPT_URI		Protocola Javascript dans une URI
 lang fr describe JODY			Contient le "t�moignage" de "ma femme Jody"
 lang fr describe JOIN_MILLIONS		Contient "Join Millions of Americans"
-lang fr describe KIFF			Contient la formule "temple kiff"
 lang fr describe KOREAN_UCE_SUBJECT	Le sujet contient des caract�res cor�ens
-lang fr describe LARGE_COLLECTION	Pornographie probable: grand nombre de films, images, etc...
-lang fr describe LARGE_HEX		Contient une grande proportion de caract�res hexad�cimaux
 lang fr describe LESBIAN                Pornographie probable: site lesbien
 lang fr describe LIMITED_TIME_ONLY	Propose une "offre � dur�e limit�e"
 lang fr describe LINES_OF_YELLING	Contient une ligne enti�rement en majuscules
@@ -500,7 +470,6 @@
 lang fr describe LOW_INTEREST		"Faibles taux d'int�r�t" (Lower Interest Rates)
 lang fr describe LOW_PAYMENT		Contient "Lower Monthly Payment" (Paiment mensuel plus bas)
 lang fr describe LOW_PRICE              Contient "Lowest Price" (le prix le plus bas)
-lang fr describe LUXURY_CAR		Luxury Car
 lang fr describe LYING_EYES		"Vous n'en croirez pas vos yeux !"
 lang fr describe MAILTO_SUBJ_REMOVE	Une URI d'envoi de mail indique un test de suppression
 lang fr describe MAILTO_TO_B2BMAIL	Contient un lien vers une adresse mail de spammeur probable (b2b-mail)
@@ -510,12 +479,8 @@
 lang fr describe MAILTO_WITH_SUBJ	Contient un lien pour envoyer un e-mail avec un en-t�te Subject:
 lang fr describe MAIL_IN_ORDER_FORM     Contient la formule "Mail-in Order From"
 lang fr describe MANY_EXCLAMATIONS	Le sujet comporte de nombreux points d'exclamation
-lang fr describe MARKETING		Contient "Direct Marketing"
 lang fr describe MARKETING_PARTNERS	Pr�tend que vous vous �tes enregistr� aupr�s d'un "partenaire" quelconque
 lang fr describe MARKET_SOLUTION	Contient "Marketing Solutions"
-lang fr describe MARKUP_RAND            Contient "RAND": Outil de spam al�atoire mal utilis�
-lang fr describe MARKUP_SSPL            Contient "SSPL": Outil de spam al�atoire mal utilis�
-lang fr describe MASS_EMAIL		Mentionne le mailing de masse
 lang fr describe MDAEMON_2_7_4		Re�u via un serveur SMTP buggu� (MDaemon 2.7.4SP4R)
 lang fr describe MEET_SINGLES		Propose de rencontrer des c�libataires
 lang fr describe MEGA_SITE              Pornographie possible "Mega porn"
@@ -559,8 +524,6 @@
 lang fr describe MLM			Le message parle de marketing multi-niveaux
 lang fr describe MONEY_BACK		Vous garantit un "remboursement si insatisfait" (en anglais)
 lang fr describe MONEY_MAKING		Contient la formule "money making"
-lang fr describe MONSTERHUT             Le message mentionne monsterhut.com
-lang fr describe MORE_TRAFFIC           Contient "More Internet Traffic" (g�n�rez plus de trafic Internet)
 lang fr describe MORTGAGE_BEST		Informations sur des pr�ts (mortgage)
 lang fr describe MORTGAGE_LINKS		Comporte un lien vers une URI "mortgage" (pr�ts)
 lang fr describe MORTGAGE_NETWORK       Parle d'un r�seau de pr�ts
@@ -586,7 +549,6 @@
 lang fr describe MUST_BE_18             Pornographie possible "Must be 18" (il faut �tre majeur)
 lang fr describe NA_DOLLARS		Parle d'un million de dollars "nord-am�ricains"
 lang fr describe NASTY_GIRLS            Pornographie probable "Nasty Girls" (sal....)
-lang fr describe NATURAL_VIAGRA         Vante un pr�tendu "Natural Viagra"
 lang fr describe NEVER_ANOTHER		Pr�tend (en anglais) qu'aucun autre mail ne sera plus envoy�
 lang fr describe NEW_CUSTOMER		Pour "New Customers Only" (nouveaux clients seulement)
 lang fr describe NEW_DOMAIN_EXTENSIONS	Propose la vente de noms de domaines des nouveaux TLDs
@@ -605,7 +567,6 @@
 lang fr describe NOT_ADVISOR		Contient "Not registered investment advisor"
 lang fr describe NOT_INTENDED		Soi-disant r�serv� � ceux qui n'habitent pas tel �tat
 lang fr describe NOT_MLM		Apparemment PAS du marketing multi-niveaux
-lang fr describe NO_AGE			"Sans restriction d'�ge"
 lang fr describe NO_CATCH		Pr�tend que ce n'est pas une arnaque
 lang fr describe NO_COST		Propose un produit ou service � un co�t nul
 lang fr describe NO_CREDIT_CHECK	Contient "No Credit Check"
@@ -625,7 +586,6 @@
 lang fr describe NO_RDNS_DOTCOM_HELO	HELO de F.A.I. important, mais pas de rDNS
 lang fr describe NO_REAL_NAME		Le champ From: ne contient pas le nom complet de l'exp�diteur
 lang fr describe NO_SELLING             Pr�tend ne rien vendre
-lang fr describe NO_STRINGS		Contient "No Strings Attached"
 lang fr describe NUMERIC_HTTP_ADDR	Utilise une adresse IP, sans points, dans une URL
 lang fr describe OBFUSCATING_COMMENT	Commentaires HTML inutiles destin�s � camoufler le texte
 lang fr describe OBSCURED_EMAIL         Le message semble contenir une adresse mail camoufl�e par rot13
@@ -648,36 +608,22 @@
 lang fr describe ORDER_REPORT           Incite � commander un "rapport" � quelqu'un
 lang fr describe OUR_AFFILIATE_PARTNERS Mentionne leurs "partenaires affili�s"
 lang fr describe OUR_COMPENSATION	Mentionne leur "compensation compl�te"
-lang fr describe OUR_PRIVACY_POLICY 	Mentionne leur politique de confidentialit� (privacy policy)
-lang fr describe OUR_PUBLICATIONS	Mentionne leur site web et/ou publications
 lang fr describe OUR_STRICT_ANTI	Mentionne leur "stricte antipathie" pour quelque chose
-lang fr describe OVERWHELMING_GROWTH	Mentionne leur "extraordinaire croissance"
 lang fr describe PAY_SITE               Pornographie probable - Site payant
 lang fr describe BODY_ENHANCEMENT		Arnaque pr�tendant augmenter la taile de votre p�nis
 lang fr describe BODY_ENHANCEMENT2		Arnaque pr�tendant augmenter la taile de votre p�nis
 lang fr describe PENNIES_A_DAY		Contient la formule "for only pennies a day"
-lang fr describe PHONE_CANCER           Escroquerie � propos de "cancers provoqu�s par t�l�phones mobiles"
 lang fr describe PLING_PLING		Le sujet contient plusieurs points d'exclamation
 lang fr describe PLING_QUERY		Le sujet a un point d'interrogation ET un point d'exclamation
 lang fr describe PORN_4			Contient des mots ou phrases � caract�re pornographique
-lang fr describe PORN_6			Contient des mots ou phrases � caract�re pornographique
 lang fr describe PORN_15 		Pornographie possible: Diff�rents types de "feline"
 lang fr describe PORN_16 		Pornographie probable - "nasty, dirty, little" etc.
-lang fr describe PORN_GALLERIES         Pornographie probable - Galleries d'images
-lang fr describe PORN_MEMBERSHIP        Pornographie probable - Adh�sion (membership)
-lang fr describe PORN_PASSWORD          Pornographie probable - Mots de passe
 lang fr describe POST_IN_RCVD		Un en-t�te Received: contient l'adresse falsifi�e Post.cz
 lang fr describe PREST_NON_ACCREDITED	Fait r�f�rence a une "prestigieuse universit�" non reconnue
 lang fr describe PRIORITY_MAIL          Parle de commandes envoy�es par courrier prioritaire
 lang fr describe PRIORITY_NO_NAME	Poss�de un indicateur de priorit�, mais pas d'en-t�te X-Mailer
-lang fr describe PRINT_FORM_SIGNATURE	Contient un formulaire � imprimer et renvoyer sign�
-lang fr describe PRIZE			Parle de prix (� gagner)
-lang fr describe PRODUCED_AND_SENT_OUT	Formule mentionnant que ce message est une publicit�
 lang fr describe PROMOTION		Contient "Special Promotion"
-lang fr describe PSYCHIC                Escroquerie parapsychologique
-lang fr describe PURE_PROFIT		Contient "pure profit"
 lang fr describe PYZOR_CHECK		Message list� par Pyzor, voir http://pyzor.sf.net/
-lang fr describe RAPE                   Pornographie probable - viols
 lang fr describe RATWARE_BAD_REFS	Mauvais format d'en-t�te References
 lang fr describe RATWARE_BANG_HASH 	Trace de logiciel de spam (bang-hash) dans les en-t�tes
 lang fr describe RATWARE_CARETOP	Trace de logiciel de spam (Caretop) dans les en-t�tes
@@ -762,12 +708,9 @@
 lang fr describe REFINANCE_YOUR_HOME	Offre de refinancement immobilier
 lang fr describe REMOVAL_INSTRUCTIONS	Contient des instructions pour �tre "retir� de la liste"
 lang fr describe REMOVE_FROM_LIST	Contient des instructions pour �tre "retir� de la liste"
-lang fr describe REMOVE_IN_QUOTES	Contient des instructions pour �tre "retir� de la liste"
 lang fr describe REMOVE_PAGE		Contient une URL pointant sur une page de nom "remove"
 lang fr describe REMOVE_POSTAL		Demande l'envoi d'un courrier papier pour �tre (soi-disant) retir� de la liste
 lang fr describe REMOVE_REMOVAL_1WORD	Contient des informations de d�sabonnement
-lang fr describe REMOVE_REMOVAL_2WORD	Contient des informations de d�sabonnement
-lang fr describe REMOVE_REMOVAL_NEAR	Contient des informations de d�sabonnement
 lang fr describe REMOVE_SUBJ		Contient des instructions pour �tre "retir� de la liste"
 lang fr describe REPLY_REMOVE_SUBJECT	Contient des instructions pour �tre "retir� de la liste"
 lang fr describe REPLY_TO_EMPTY		Contient un en-t�te Reply-To: vide
@@ -786,8 +729,6 @@
 lang fr describe SAVE_THOUSANDS         Pr�tend vous faire �conomiser beaucoup d'argent
 lang fr describe SAVE_UP_TO             Pr�tend vous faire �conomiser de l'argent
 lang fr describe SAVINGS		Le sujet parle d'�pargne/�conomies
-lang fr describe SEARCH_ENGINE_PROMO    Propose une m�thode pour lister votre site dans les moteurs de recherche
-lang fr describe SECRET_RECORD		Contient "Secretly Recorded" (enregistrement secret)
 lang fr describe SECTION_301		Pr�tend �tre conforme � l'arr�t� anti-SPAM 301
 lang fr describe SEDUCTION		Pr�tend vous aider � avoir du succ�s aupr�s des femmes
 lang fr describe SEE_FOR_YOURSELF       Offre de juger par vous-m�me
@@ -796,14 +737,9 @@
 lang fr describe SERIOUS_CASH		Contient "Serious cash" - Du fric, toujours du fric...
 lang fr describe SERIOUS_ONLY		"Offre r�serv�e aux clients s�rieux"
 lang fr describe SEX_FEST               Pornographie probable - Porn Fest
-lang fr describe SHOPPING_SPREE		Contient "Shopping Spree"
 lang fr describe SMTPD_IN_RCVD		Message transmis par un serveur SMTPD32
 lang fr describe SOME_BREAKTHROUGH	Parle d'une quelconque "avanc�e spectaculaire" (breakthrough)
 lang fr describe SORTED_RECIPS		La liste des destinataires est tri�e par ordre alphab�tique
-lang fr describe SPAM_FORM		Contient un formulaire pour changer votre adresse e-mail
-lang fr describe SPAM_FORM_ACTION	Attribut d'action camoufl� dans un formulaire HTML
-lang fr describe SPAM_FORM_INPUT	Contient un forumlaire pour v�rifier votre adresse e-mail
-lang fr describe SPAM_FORM_RETURN	Contient un forumlaire pour v�rifier votre adresse e-mail
 lang fr describe START_NOW_CAPS 	Parle de "commencer d�s maintenant" avec des majuscules
 lang fr describe STOCK_ALERT		Contient la formule "stock alert"
 lang fr describe STOCK_PICK		Contient la formule "stock pick"
@@ -835,14 +771,9 @@
 lang fr describe SUB_FREE_OFFER         Le sujet commence par "Free" (gratuit)
 lang fr describe SUB_HELLO		Le sujet commence par "Hello"
 lang fr describe SUSPICIOUS_RECIPS	L'en-t�te To: contient plus de dix fois le m�me nom de domaine
-lang fr describe SUPPLIES_LIMITED	Evoque un "stock limit�"
-lang fr describe S_1618			Pr�tend �tre conforme � l'arr�t� anti-SPAM 1618
-lang fr describe TAKE_ACTION_NOW	Contient une formule incitant � agir imm�diatement
 lang fr describe TARGETED		Parle d'envoi de messages "cibl�s" (targeted)
 lang fr describe THE_BEST_RATE		Contient "Les meilleurs taux" (the best rates)
-lang fr describe THE_FOLLOWING_FORM	Contient la formule "the following form" (le formulaire suivant)
 lang fr describe THIS_IS_AN_AD		Dit qu'il s'agit d'une publicit� (merci ! Hop, poubelle !)
-lang fr describe TONER			Contient la formule "toner cartridge"
 lang fr describe TO_ADDRESS_EQ_REAL	L'en-t�te To: R�p�te l'adresse e-mail comme nom v�ritable
 lang fr describe TO_EMPTY		L'en-t�te To: est vide (pas de destinataire principal sp�cifi�)
 lang fr describe TO_FILENAME		L'en-t�te "To:" contient un nom de fichier
@@ -882,19 +813,16 @@
 lang fr describe USER_IN_MORE_SPAM_TO	Destinataire sur la liste "more_spam_to" (config SA locale)
 lang fr describe USER_IN_WHITELIST	Exp�diteur sur la liste blanche (OK) (config SA locale)
 lang fr describe USER_IN_WHITELIST_TO	Destinataire sur la liste blanche (config SA)
-lang fr describe USER_4U2               La partie locale contient une variante de "4u"
 lang fr describe USE_IDENTITY		Parle de quelqu'un "utilisant votre identit�"
 lang fr describe US_DOLLARS		Escroquerie nig�rienne, phrase cl�
 lang fr describe US_DOLLARS_2           Escroq. nig�rienne, version modifi�e, phrase cl� ($NNN.N m/USDNNN.N m)
 lang fr describe US_DOLLARS_3           Escroq. nig�rienne, version modifi�e, phrase cl� ($NN,NNN,NNN.NN)
 lang fr describe VACATION_SCAM		Escroquerie: Offre de vacances
 lang fr describe VAR_REF_IN_RECEIVED    Un en-t�te Received contient une r�f�rence $variable
-lang fr describe VERB_UP_TO_OR_MORES	Contient du bruit de type 'add/lose/make/save up to X or more'
 lang fr describe VERY_SUSP_RECIPS	L'en-t�te To: contient plus de dix fois le m�me nom de destinataire
 lang fr describe VIAGRA			Mentionne le Viagra
 lang fr describe VIAGRA_COMBO           Viagra et autres produits pharmaceutiques
 lang fr describe VIAGRA_ONLINE          Vente de Viagra par correspondance
-lang fr describe VJESTIKA		Propose l'aphrodisiaque Vjestika
 lang fr describe WALAA			Les spammeurs illettr�s ne savent pas �crire "voil�"
 lang fr describe WEALTH                 Vous propose de devenir riche, beau, c�l�bre et puissant
 lang fr describe WEIRD_PORT		Lien HTTP vers un num�ro de port non standard

Modified: incubator/spamassassin/trunk/rules/50_scores.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/50_scores.cf	(original)
+++ incubator/spamassassin/trunk/rules/50_scores.cf	Wed Feb 25 20:25:25 2004
@@ -141,7 +141,6 @@
 score CLICK_BELOW 0.100 0.001 0.001 0.100
 score CLICK_BELOW_CAPS 0.173 0.566 0.500 0.500
 score CLICK_TO_REMOVE_1 1.101 1.101 1.000 1.001
-score COMMUNIGATE 2.300 1.465 1.554 2.399
 score COMPLETELY_FREE 0.500 0.736 0.500 0.500
 score CONSOLIDATE_DEBT 4.300 4.300 1.001 2.995
 score CUM_SHOT 2.899 2.796 0.001 2.699
@@ -159,7 +158,6 @@
 score DEAR_SOMETHING 1.611 1.157 2.164 2.299
 score DISGUISE_PORN 2.600 2.397 2.297 1.772
 score DOMAIN_4U2 1.097 0.637 0.820 0.001
-score DOMAIN_BODY 1.479 1.797 1.052 2.199
 score DONT_DELETE 1.566 0.827 0.565 1.658
 score DO_IT_TODAY 0.774 0.707 0.801 0.704
 score DRASTIC_REDUCED 0.943 1.998 1.797 1.799
@@ -172,7 +170,6 @@
 score EXCUSE_13 0.853 1.639 0.001 0.580
 score EXCUSE_14 0.320 0.153 0.001 0.084
 score EXCUSE_16 0.061 0.171 0.001 0.001
-score EXCUSE_18 0.430 0.280 0.001 0.001
 score EXCUSE_19 0.727 0.500 0.613 0.500
 score EXCUSE_24 0.700 1.395 2.796 2.700
 score EXCUSE_3 0.100 0.100 0.001 0.001
@@ -218,7 +215,6 @@
 score FREE_MEMBERSHIP 2.163 2.624 0.001 1.148
 score FREE_PORN 1.352 2.397 0.700 2.699
 score FREE_PREVIEW 1.039 1.850 2.297 2.071
-score FREE_QUOTE 1.924 2.796 0.001 2.343
 score FREE_SAMPLE 1.174 1.546 0.001 2.242
 score FREE_TRIAL 0.144 0.509 0.001 0.896
 score FROM_ALL_NUMS 2.165 1.159 2.233 0.692
@@ -311,8 +307,6 @@
 score INVALUABLE_MARKETING 2.900 2.800 1.119 0.701
 score JODY 2.900 2.800 0.701 0.701
 score JOIN_MILLIONS 2.599 1.843 0.001 1.098
-score KIFF 2.900 2.800 1.256 0.978
-score LARGE_HEX 0.633 1.595 1.193 1.160
 score LIMITED_TIME_ONLY 0.478 0.020 0.001 0.246
 score LINK_TO_NO_SCHEME 0.452 0.755 0.176 1.597
 score LIVE_PORN 2.233 1.801 0.001 2.333
@@ -324,7 +318,6 @@
 score LOW_INTEREST 0.058 1.915 0.001 0.605
 score LOW_PAYMENT 1.610 1.264 0.001 0.701
 score LOW_PRICE 0.089 0.715 0.001 0.001
-score LUXURY_CAR 1.934 2.156 0.001 1.071
 score LYING_EYES 0.146 2.330 0.001 2.599
 score MAILTO_SUBJ_REMOVE 0.831 1.325 1.931 0.889
 score MAILTO_TO_REMOVE 0.855 0.037 0.656 0.001
@@ -383,7 +376,6 @@
 score NO_QS_ASKED 2.271 2.005 1.018 2.600
 score NO_RDNS_DOTCOM_HELO 2.194 2.952 2.865 4.099
 score NO_REAL_NAME 0.339 0.285 0.339 0.160
-score NO_STRINGS 1.537 2.098 0.001 1.392
 score NUMERIC_HTTP_ADDR 2.899 2.800 2.696 0.989
 score OFFERS_ETC 0.905 0.197 0.518 0.227
 score OFFSHORE_SCAM 2.499 1.227 1.894 1.268
@@ -405,9 +397,7 @@
 score PORN_16 0.217 0.014 1.197 0.775
 score PORN_4 1.375 1.302 2.498 1.888
 score PREST_NON_ACCREDITED 0.898 1.367 0.001 1.103
-score PRINT_FORM_SIGNATURE 1.263 0.125 0.039 1.617
 score PRIORITY_NO_NAME 0.704 0.831 0.701 1.212
-score PRIZE 2.396 2.696 1.740 1.784
 score RATWARE_HASH_2_V2 2.669 2.448 0.685 1.618
 score RATWARE_RCVD_LC_ESMTP 4.300 4.299 3.286 3.771
 score RCVD_FAKE_HELO_DOTCOM 2.063 1.354 3.207 1.555
@@ -416,11 +406,8 @@
 score REFINANCE_NOW 2.012 1.359 2.696 2.010
 score REMOVAL_INSTRUCTIONS 0.870 0.692 0.959 2.599
 score REMOVE_FROM_LIST 0.166 0.001 0.001 0.001
-score REMOVE_IN_QUOTES 0.001 0.187 0.001 0.001
 score REMOVE_PAGE 1.052 0.822 1.189 0.501
 score REMOVE_REMOVAL_1WORD 1.101 1.100 0.500 1.891
-score REMOVE_REMOVAL_2WORD 0.500 0.500 0.500 1.947
-score REMOVE_REMOVAL_NEAR 0.224 1.140 0.001 0.789
 score REMOVE_SUBJ 0.343 0.054 0.001 0.355
 score REPLY_REMOVE_SUBJECT 0.412 0.757 1.432 2.097
 score REPLY_TO_EMPTY 0.065 0.888 1.663 2.599
@@ -431,7 +418,6 @@
 score ROUND_THE_WORLD_LOCAL 3.072 2.965 2.696 2.699
 score SAVE_THOUSANDS 2.332 2.555 1.029 2.699
 score SAVE_UP_TO 0.267 0.105 0.001 0.001
-score SECRET_RECORD 2.599 2.157 2.515 2.699
 score SEDUCTION 2.283 2.367 0.787 1.208
 score SEE_FOR_YOURSELF 0.001 0.023 0.001 0.001
 score SELECTED_YOU 0.764 2.059 0.001 1.381
@@ -456,11 +442,9 @@
 score SUBJ_YOUR_OWN 0.391 2.052 0.110 2.299
 score SUB_FREE_OFFER 0.803 0.484 0.223 1.660
 score SUB_HELLO 0.872 2.696 1.514 2.456
-score SUPPLIES_LIMITED 1.623 1.496 0.001 0.332
 score SUSPICIOUS_RECIPS 2.632 3.003 2.696 2.599
 score TARGETED 1.686 1.271 0.001 2.499
 score THE_BEST_RATE 3.254 3.724 0.700 2.145
-score THE_FOLLOWING_FORM 1.640 1.173 0.420 0.655
 score TO_HAS_SPACES 0.492 2.397 0.001 0.001
 score TO_ADDRESS_EQ_REAL 0.444 0.011 0.593 0.778
 score TO_MALFORMED 0.345 0.274 0.907 0.640
@@ -561,7 +545,6 @@
 score MSGID_SPAM_99X9XX99 4.300 4.300 4.100 4.100
 score MSGID_SPAM_ZEROES 4.400 4.300 4.200 4.100
 score MULTI_FORGED 2.900 2.800 2.800 2.700
-score NATURAL_VIAGRA 2.900 2.800 0.001 2.700
 score NEVER_ANOTHER 2.900 2.800 2.800 2.700
 score NIGERIAN_BODY_GOVT_3 2.900 2.800 2.800 2.700
 score NONEXISTENT_CHARSET 2.900 2.800 2.800 2.700
@@ -573,7 +556,6 @@
 score OBSCURED_EMAIL 2.900 2.800 2.800 2.700
 score ORDER_REPORT 2.900 2.800 2.800 2.700
 score OUR_STRICT_ANTI 2.900 2.800 2.800 2.700
-score PORN_MEMBERSHIP 2.900 2.800 2.800 2.700
 score RATWARE_BAD_REFS 2.900 2.800 2.800 2.700
 score RATWARE_EGROUPS 4.103 4.300 4.100 4.100
 score RATWARE_EMPTY_HELO 2.900 2.800 2.800 2.700
@@ -631,7 +613,6 @@
 score NO_SELLING 0.001
 score X_FIX_PRESENT 0.001
 score CREDIT_CARD 0.001
-score INTL_EXEC_GUILD 0.001
 score HTML_SHOUTING5 0.001 1.762 0.001 0.001
 score RATWARE_EMWAC 1.799 1.498 0.001 0.001
 score POST_IN_RCVD 0.001
@@ -640,26 +621,19 @@
 score FAKE_HELO_FLASHMAIL 0.001
 score UNIVERSITY_DIPLOMAS 0.001
 score DATE_IN_FUTURE_48_96 0.001
-score HR_4176 2.900 0.001 0.001 0.001
 score LINES_OF_YELLING_2 0.001 0.105 0.001 0.001
-score CBYI 0.030 0.001 0.001 0.001
 score MORTGAGE_WAITING 0.001
-score SPAM_FORM_INPUT 0.001
 score WHY_PAY_MORE 0.001 2.125 0.001 0.001
-score INCREDIBLE 0.001
 score INTL_DRIVERS_LICENSE 0.001
 score MIME_BOUND_HASHES 0.001
-score CREDIT_BUREAU 0.001
 score DOMAINS_CHEAP 0.001
 score FORGED_RCVD_HELO 0.001
-score CLICK_TO_REMOVE_2 0.001
 score HTML_IMAGE_RATIO_14 0.001 0.276 0.001 0.001
 score SOME_BREAKTHROUGH 0.001 0.599 0.001 0.001
 score URI_IS_POUND 0.001 0.185 0.001 0.001
 score HTML_COMMENT_EMAIL 0.001
 score HTML_ALL_CAPS 0.001
 score UPPERCASE_75_100 0.001
-score RAPE 0.001
 score OUR_COMPENSATION 0.001
 score SUBJ_REMOVE 0.001
 score RATWARE_GR 0.001
@@ -670,16 +644,12 @@
 score CASHCASHCASH 0.001
 score SUBJ_LIFE_INSURANCE 0.001 1.657 0.001 0.001
 score HTML_FONT_LOW_CONTRAST 0.001
-score PHONE_CANCER 0.001
 score HIDDEN_CHARGES 0.001
-score PRODUCED_AND_SENT_OUT 0.001
 score MIME_BOUND_DIGITS_4 0.001
 score BLANK_LINES_90_100 0.001
 score RATWARE_DIRECT_EMAIL 0.001 2.800 0.001 0.001
 score NO_FEE 0.001
 score HTML_WITH_BGCOLOR 0.001
-score SPAM_FORM 0.001
-score FALLING_INTEREST 0.001
 score MISSING_HEADERS 0.001
 score FULL_REFUND 0.001
 score WORRY_FREE 0.001
@@ -692,7 +662,6 @@
 score FRIEND_AT_PUBLIC 2.900 0.001 0.001 0.001
 score MAILTO_LINK 0.001
 score MICROSOFT 0.001
-score EXCUSE_20 2.900 0.001 0.001 0.001
 score OPT_OUT 0.001
 score FRIEND_PUBLIC 0.001
 score MORTGAGE_NETWORK 0.001
@@ -708,28 +677,18 @@
 score E_MAILPROMO_URL 0.001
 score HTML_WIN_OPEN 0.001
 score HTML_TAG_EXISTS_PARAM 0.001
-score OUR_PUBLICATIONS 0.001
 score AZOOGLE 2.900 0.001 2.800 0.001
 score TO_NO_USER 1.662 1.498 1.597 0.001
-score INCREASE_SOMETHING 0.001
 score HTML_FONTCOLOR_YELLOW 0.001
 score NIGERIAN_SUBJECT6 0.001
-score AUTO_EMAIL_REMOVAL 0.001
-score MARKUP_RAND 2.900 2.800 0.001 0.001
 score RATWARE_SCREWUP_1 2.900 2.800 0.001 0.001
 score SEX_FEST 1.966 0.001 0.001 0.001
 score RATWARE_DIFFOND 0.001
 score IDENT_NOBODY 1.654 0.001 0.001 0.001
 score OFFER 0.001
 score WE_HATE_SPAM2 0.001 0.055 0.001 0.001
-score MARKUP_SSPL 0.001
-score ENHANCE_WEBSITE 0.001
-score SEARCH_ENGINE_PROMO 0.001
-score USER_4U2 0.524 1.697 1.897 0.001
 score X_MAILER_GIBBERISH 0.001
 score DATE_IN_PAST_24_48 0.001
-score TONER 0.555 1.288 0.001 0.001
-score NO_AGE 0.001
 score HTML_10_20 0.001
 score MSGID_THREESIXSIX 0.196 1.298 0.001 0.001
 score RATWARE_HASH_2 0.001 1.237 0.001 0.001
@@ -738,31 +697,24 @@
 score CONGRATULATIONS 0.001 0.041 0.001 0.001
 score TO_INVESTORS 0.001
 score FAKE_HELO_NETZERO 0.001
-score FREE_DVD 0.001
 score SUBJ_NOW_ONLY 0.045 0.577 0.001 0.001
 score GREAT_OFFER 0.001
 score SERIOUS_ONLY 0.001
 score CALL_FREE 0.001
 score SUBJ_DOUBLE_YOUR 0.001 2.232 0.001 0.001
-score CHILD_SUPPORT 0.001
 score FREE_CELL_PHONE 0.001
 score SAFEGUARD_NOTICE 0.001
 score MAILTO_WITH_SUBJ 0.001
 score MSGID_3_DOLLARS 2.900 0.001 2.800 0.001
 score EMAIL_MARKETING 0.001
 score NO_MIDDLEMAN 0.001
-score S_1618 0.001
-score ANTISPAM_BILL 0.001 2.800 0.001 0.001
 score X_VMP_TEXT 2.900 2.800 2.800 0.001
 score NEW_CUSTOMER 0.001
 score RCVD_BY_QVES_COM 2.900 0.001 0.001 0.001
 score LOTS_OF_CC_LINES 2.900 2.800 0.001 0.001
 score TRACE_BY_SSN 0.001
 score ONLINE_BIZ_OPS 0.001
-score OUR_PRIVACY_POLICY 2.900 0.001 0.001 0.001
-score EJACULATION 0.001
 score LINES_OF_YELLING_3 0.001
-score MASS_EMAIL 0.001
 score RUSSIAN_UCE_SUBJECT 0.001
 score PENNIES_A_DAY 0.001
 score ONLY_COST 0.001
@@ -773,8 +725,6 @@
 score CALL_NOW 0.001
 score NO_FORMS 0.001 1.337 0.001 0.001
 score APPLY_ONLINE 0.001
-score EXCUSE_8 0.001
-score PORN_6 2.900 2.800 0.001 0.001
 score DIRECT_EMAIL 0.001
 score FOR_JUST_SOME_AMT 0.001
 score TO_EMPTY 1.600 0.001 0.001 0.001
@@ -792,24 +742,18 @@
 score HTML_FONT_FACE_CAPS 0.001
 score SECTION_301 0.001 0.454 0.001 0.001
 score UNDER_BILL_1618 0.001 0.253 0.001 0.001
-score OVERWHELMING_GROWTH 2.900 0.001 0.001 0.001
-score LARGE_COLLECTION 0.001
 score BILLION_DOLLARS 0.001
 score WEALTH 0.001
 score DATE_IN_PAST_48_96 0.001
 score HTML_FONTCOLOR_GRAY 0.001
 score FURTHER_TRANSMISSIONS 0.001 2.800 0.001 0.001
 score MAILTO_TO_B2BMAIL 0.001
-score TAKE_ACTION_NOW 1.453 0.001 0.001 0.001
-score PORN_GALLERIES 0.001
 score X_SERV_HOST_PRESENT 0.001 2.800 0.001 0.001
 score HTML_SHOUTING6 0.001
 score SAVE_BUCKS 0.001
 score HTML_IMAGE_AREA_09 0.001
 score RATWARE_IMKTG 0.001
-score SPAM_FORM_RETURN 0.001
 score EXCUSE_7 0.001
-score VJESTIKA 0.001
 score RATWARE_LC_OUTLOOK 0.001
 score HTML_TAG_BALANCE_HEAD 0.001
 score HTML_FONTCOLOR_CYAN 0.001
@@ -818,16 +762,11 @@
 score FREE_INSTALL 1.225 1.661 2.399 0.001
 score EARN_PER_WEEK 0.001
 score INCOME 1.356 0.001 0.001 0.001
-score HELPED_FINANCE 0.001
 score HTML_FONTCOLOR_NAME 0.001
 score CENTS_ON_DOLLAR 1.799 1.597 0.001 0.001
 score SUBJ_RIPPED 0.001
 score TO_FILENAME 0.001
-score GENTLE_FEROCITY 0.001
-score DISCONTINUE 0.001
-score EASY_TERMS 0.001
 score FANTASTIC 0.001
-score MARKETING 0.001
 score OPPORTUNITY_2 0.001
 score MURKOWSKI_CRUFT 0.001
 score HTML_EVENT 0.001
@@ -838,33 +777,25 @@
 score HTML_IMAGE_AREA_08 0.001
 score LINES_OF_YELLING 0.001 0.011 0.001 0.001
 score CHINA_URL 2.900 0.001 0.001 0.001
-score MORE_TRAFFIC 0.001
 score NO_GIMMICK 0.001
-score SHOPPING_SPREE 0.001
 score HERBAL_VIAGRA 0.001
-score EXCUSE_2 0.001
 score URGENT_BIZ 0.001 0.796 0.001 0.001
 score NO_PURCHASE 0.001
 score HTML_IMAGE_RATIO_02 0.001
 score RATWARE_CHARSET 0.001
 score NA_DOLLARS 0.001 1.997 0.001 0.001
 score HTML_FONTCOLOR_MAGENTA 0.001
-score PURE_PROFIT 0.001
 score HTML_IMAGE_AREA_06 0.001
 score STOCK_PICK 0.001 1.248 0.001 0.001
 score DAILY_PL 2.900 2.800 0.001 0.001
-score EXPERTS_SHOW_HOW 0.001
 score IP_LINK_PLUS 0.001
 score SATISFACTION 0.001
-score ASCII_FORM_ENTRY 0.001
 score RATWARE_RCVD_BONUS_SPC 0.001
 score ITS_LEGAL 0.001
 score RATWARE_BANG_HASH 0.001
 score HTML_COMMENT_SHOUTING 0.001
 score TO_RECIP_MARKER 0.001
-score PORN_PASSWORD 0.001
 score RATWARE_VC_IPA 2.900 0.001 2.800 0.001
-score PSYCHIC 0.001
 score PRIORITY_MAIL 0.001
 score RATWARE_SCREWUP_2 0.001
 score HTML_JAVASCRIPT 0.001
@@ -873,11 +804,8 @@
 score MIME_BOUND_MA 0.001
 score X_MAIL_ID_PRESENT 0.001 2.800 0.001 0.001
 score HTML_EVENT_UNSAFE 0.001 0.130 0.001 0.001
-score MONSTERHUT 0.001
 score FREE_LEADS 1.538 1.467 0.001 0.001
-score SPAM_FORM_ACTION 0.001
 score US_DOLLARS_2 0.001
-score VERB_UP_TO_OR_MORES 2.900 2.800 0.001 0.001
 score UP_TO_OR_MORES 0.001 0.390 0.001 0.001
 score DOMAIN_SUBJECT 0.001
 score RATWARE_EVAMAIL 2.900 2.800 0.001 0.001
@@ -903,7 +831,6 @@
 score NO_DNS_FOR_FROM 0 1.105 0 1.650
 score ROUND_THE_WORLD 0 2.515 0 2.141
 
-
 #
 # message digest tests
 #
@@ -918,7 +845,6 @@
 
 ## Pyzor: http://pyzor.sourceforge.net/
 score PYZOR_CHECK 0 0.322 0 3.511
-
 
 #
 # DNS Blacklists

Modified: incubator/spamassassin/trunk/rules/regression_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/regression_tests.cf	(original)
+++ incubator/spamassassin/trunk/rules/regression_tests.cf	Wed Feb 25 20:25:25 2004
@@ -32,7 +32,6 @@
 test FROM_STARTS_WITH_NUMS     fail matt@sergeant.org
 test FORGED_YAHOO_RCVD fail by mf1.lng.yahoo.com (8.11.1/8.11.1) id g3SDfPH19426
 test NUMERIC_HTTP_ADDR ok http://123456789/foo/bar
-#test SEARCH_ENGINE_PROMO ok	evaluated for FREE for its keyword placement in the top twenty major search engines
 
 test US_DOLLARS fail $-$NFbMF$K!"A49q$+$iLd$$9g$o$;$,;&E~$7$F$$$^$9!#
 test US_DOLLARS ok Twenty Million Five Hundred Thousand United States Dollars
@@ -95,14 +94,3 @@
 test BAD_CREDIT ok   repair your credit
 test BAD_CREDIT fail NOTICE: Your credit card company may place the words "San Antonio"
 
-test NEW_DOMAIN_EXTENSIONS ok   new domain extension
-test NEW_DOMAIN_EXTENSIONS ok   new .NAME domain extension
-test NEW_DOMAIN_EXTENSIONS ok   New TLD Extension
-test NEW_DOMAIN_EXTENSIONS ok   new extension
-test NEW_DOMAIN_EXTENSIONS fail newt extension
-test NEW_DOMAIN_EXTENSIONS fail renew extension
-
-test DOMAIN_BODY ok   Get .BIZ while it's hot!
-test DOMAIN_BODY ok   .info
-test DOMAIN_BODY ok   Get new .us domains
-test DOMAIN_BODY fail www.fobar.biz

Modified: incubator/spamassassin/trunk/t/data/spam/011
==============================================================================
Binary files. No diff available.

Modified: incubator/spamassassin/trunk/t/html_obfu.t
==============================================================================
--- incubator/spamassassin/trunk/t/html_obfu.t	(original)
+++ incubator/spamassassin/trunk/t/html_obfu.t	Wed Feb 25 20:25:25 2004
@@ -8,10 +8,10 @@
 
 %patterns = (
 q{ EXCUSE_13 } => 'EXCUSE_13',
-q{ NATURAL_VIAGRA } => 'NATURAL_VIAGRA',
 q{ GUARANTEE } => 'GUARANTEE',
 q{ ALL_NATURAL } => 'ALL_NATURAL',
 q{ OUR_AFFILIATE_PARTNERS } => 'OUR_AFFILIATE_PARTNERS',
+q{ VIAGRA } => 'VIAGRA',
 );
 
 %anti_patterns = (

Modified: incubator/spamassassin/trunk/t/spam.t
==============================================================================
--- incubator/spamassassin/trunk/t/spam.t	(original)
+++ incubator/spamassassin/trunk/t/spam.t	Wed Feb 25 20:25:25 2004
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spam");
-use Test; BEGIN { plan tests => 9 };
+use Test; BEGIN { plan tests => 8 };
 
 # ---------------------------------------------------------------------------
 
@@ -15,7 +15,6 @@
 q{ FROM_ENDS_IN_NUMS }, 'endsinnums',
 q{ NO_REAL_NAME }, 'noreal',
 q{ REMOVE_SUBJ }, 'removesubject',
-q{ REMOVE_IN_QUOTES }, 'remove',
 
 
 );