# HG changeset patch
# User MonztA <arthur@adblockplus.org>
# Date 1506955790 -7200
# Node ID a436c8cd8589d09690594d4f2371d35e8e3e16d8
# Parent  32bc55d37c03987b67cec0f3b866c07f97fafbac
Moved some whitelists from exceptionrules-minimal-privacy-friendly.txt to exceptionrules-minimal.txt

diff --git a/exceptionrules/exceptionrules-minimal-privacy-friendly.txt b/exceptionrules/exceptionrules-minimal-privacy-friendly.txt
--- a/exceptionrules/exceptionrules-minimal-privacy-friendly.txt
+++ b/exceptionrules/exceptionrules-minimal-privacy-friendly.txt
@@ -47,64 +47,26 @@ groups.yahoo.com#@#.yg-mbad-row
 groups.yahoo.com#@#.yg-mbad-row > *
 yahoo.com##.ysab
 
 ! Yahoo display ads (https://adblockplus.org/forum/viewtopic.php?f=12&t=24361)
 ||s.yimg.com/hl/ap/default/140801/px.png?ch=2$domain=yahoo.com
 @@||pclick.internal.yahoo.com/p/s=$image,domain=yahoo.com
 @@||dmros.ysm.yahoo.com/ros/$script,domain=autos.yahoo.com
 
-! Small text ad with static image below navigation on left side (https://adblockplus.org/forum/viewtopic.php?p=105622#p105622)
-@@||yimg.com/rq/darla/*/html/r-sf.html$subdocument,domain=yahoo.com|mail.yahoo.com
-@@||ads.yahoo.com^*^ad_size=120x45^$script,domain=s.yimg.com
-@@||ads.yahoo.com^*^Z=120x45^$script,domain=s.yimg.com|yahoo.com
-@@||pr.ybp.yahoo.com/ab/secure/true/imp/$script,domain=s.yimg.com|yahoo.com
-@@||s.yimg.com/cv/ae/*/audience/*/120x45$image,domain=s.yimg.com|yahoo.com|mail.yahoo.com
-@@||s.yimg.com/lq/lib/can_interstitial/icons/adchoice_$image,domain=s.yimg.com|yahoo.com
-@@||ads.yahoo.com/rtbs-match?nid=*&ts=*&sig=$image,domain=s.yimg.com|yahoo.com
-@@||ads.yahoo.com/clk?$popup,domain=s.yimg.com|yahoo.com
-@@||ad1.adfarm1.adition.com/banner?sid=*&kid=*&bid=*&wpt=*&ts=$image,domain=s.yimg.com
-@@||ad1.adfarm1.adition.com/banner?co=*&bid=*&kid=*&sid=*&ts=*&wpt=$image,domain=s.yimg.com
-@@||imagesrv.adition.com/1x1.gif$domain=s.yimg.com
-@@||adform.net^$popup,domain=s.yimg.com|yahoo.com
-@@||yimg.com/cv/ae/*/audience/*/120x45x$image,domain=yahoo.com
-@@||ads.yahoo.com/st?ad_type=*&publisher_blob=*|TL1|*&ad_size=120x45&$subdocument,document,script
-@@||ads.yahoo.com/get-user-id?$script,domain=s.yimg.com|yahoo.com
-@@||doubleclick.net/ddm/$popup,domain=s.yimg.com
-yahoo.com#@#.can_ad_slug
-yahoo.com#@#.ad_slug_table
-yahoo.com#@#.ad-tl1
-
-||csc.beap.bc.yahoo.com^
-
 celebrity.yahoo.com,finance.yahoo.com,news.yahoo.com,search.yahoo.com,sports.yahoo.com#@#.ad-icon
 celebrity.yahoo.com,finance.yahoo.com,news.yahoo.com,search.yahoo.com,sports.yahoo.com#@#.ad-active
 celebrity.yahoo.com,finance.yahoo.com,news.yahoo.com,search.yahoo.com,sports.yahoo.com#@#[data-ad-enhanced="pencil"]
 @@||s.yimg.com/lo/api/res/1.2/*/https://s.yimg.com/av/moneyball/ads/$domain=celebrity.yahoo.com|finance.yahoo.com|news.yahoo.com|search.yahoo.com|sports.yahoo.com
 celebrity.yahoo.com,finance.yahoo.com,news.yahoo.com,search.yahoo.com,sports.yahoo.com#@##td-applet-ads_container
 celebrity.yahoo.com,finance.yahoo.com,news.yahoo.com,search.yahoo.com,sports.yahoo.com#@#.Ad-Container
 celebrity.yahoo.com,finance.yahoo.com,news.yahoo.com,search.yahoo.com,sports.yahoo.com#@#li[data-beacon^="https://beap.gemini.yahoo.com/"]
 yahoo.com#@#.Feedback
 @@||doubleclick.net/ddm/$popup,domain=yahoo.com
 
-! Yahoo display ads (https://adblockplus.org/forum/viewtopic.php?p=157308#p157308)
-yahoo.com#@##my-adsLREC4-base
-@@||yahoo.com/sdarla/php/fc.php*^l=UBA$subdocument,domain=yahoo.com,document
-@@||na.ads.yahoo.com/yax/banner^*^asz=300x250*|UBA$subdocument,domain=s.yimg.com,document
-@@||na.ads.yahoo.com/yax/banner^*^asz=728x90*|UBA$subdocument,domain=s.yimg.com,document
-@@||na.ads.yahoo.com/yax/csc^$image,domain=s.yimg.com
-@@||s.yimg.com/rq/darla/*/html/r-csc.html$subdocument,domain=yahoo.com
-@@||csc.beap.bc.yahoo.com^*^ypos=UBA$image,domain=s.yimg.com
-||yahoo.com/px.gif?ch=2$domain=yahoo.com
-@@||yahoo.com/px.gif?ch=1$domain=yahoo.com
-@@||adserver.yahoo.com/a?$xmlhttprequest,domain=yahoo.com
-@@||yimg.com/rq/darla/i/fdb1.gif$domain=yahoo.com
-s.yimg.com#@#.ad_slug_table
-s.yimg.com#@#.CAN_ad
-
 ! Yahoo display ads (https://adblockplus.org/forum/viewtopic.php?p=142591#p142591)
 yahoo.com#@#.SidekickItem-Ads
 news.yahoo.com#@#.yom-ad
 @@||s.yimg.com/cv/ae/*/audience/*/120x45$image,domain=l.yimg.com
 
 style.yahoo.com#@#.gemini-ad
 @@||twiago.com/adclick.php$popup,domain=style.yahoo.com|nachrichten.yahoo.com
 @@||bs.serving-sys.com/BurstingPipe/adServer.bs?$popup,domain=style.yahoo.com|nachrichten.yahoo.com
diff --git a/exceptionrules/exceptionrules-minimal.txt b/exceptionrules/exceptionrules-minimal.txt
--- a/exceptionrules/exceptionrules-minimal.txt
+++ b/exceptionrules/exceptionrules-minimal.txt
@@ -2482,16 +2482,54 @@ answers.yahoo.com#@#div[id^="dmRosAdWrap
 
 ! Ads by Yahoo! Partner Ads (https://adblockplus.org/forum/viewtopic.php?f=12&t=40856)
 @@||gemini.yahoo.com^*^syndication^$script,domain=stylevamp.de
 @@||yimg.com/av/moneyball/ads/$image,domain=stylevamp.de
 @@||yimg.com/av/curveball/ads/$image,domain=stylevamp.de
 stylevamp.de#@#.sponsor-text
 @@||beap.gemini.yahoo.com^$image,domain=stylevamp.de
 
+! Small text ad with static image below navigation on left side (https://adblockplus.org/forum/viewtopic.php?p=105622#p105622)
+@@||yimg.com/rq/darla/*/html/r-sf.html$subdocument,domain=yahoo.com|mail.yahoo.com
+@@||ads.yahoo.com^*^ad_size=120x45^$script,domain=s.yimg.com
+@@||ads.yahoo.com^*^Z=120x45^$script,domain=s.yimg.com|yahoo.com
+@@||pr.ybp.yahoo.com/ab/secure/true/imp/$script,domain=s.yimg.com|yahoo.com
+@@||s.yimg.com/cv/ae/*/audience/*/120x45$image,domain=s.yimg.com|yahoo.com|mail.yahoo.com
+@@||s.yimg.com/lq/lib/can_interstitial/icons/adchoice_$image,domain=s.yimg.com|yahoo.com
+@@||ads.yahoo.com/rtbs-match?nid=*&ts=*&sig=$image,domain=s.yimg.com|yahoo.com
+@@||ads.yahoo.com/clk?$popup,domain=s.yimg.com|yahoo.com
+@@||ad1.adfarm1.adition.com/banner?sid=*&kid=*&bid=*&wpt=*&ts=$image,domain=s.yimg.com
+@@||ad1.adfarm1.adition.com/banner?co=*&bid=*&kid=*&sid=*&ts=*&wpt=$image,domain=s.yimg.com
+@@||imagesrv.adition.com/1x1.gif$domain=s.yimg.com
+@@||adform.net^$popup,domain=s.yimg.com|yahoo.com
+@@||yimg.com/cv/ae/*/audience/*/120x45x$image,domain=yahoo.com
+@@||ads.yahoo.com/st?ad_type=*&publisher_blob=*|TL1|*&ad_size=120x45&$subdocument,document,script
+@@||ads.yahoo.com/get-user-id?$script,domain=s.yimg.com|yahoo.com
+@@||doubleclick.net/ddm/$popup,domain=s.yimg.com
+yahoo.com#@#.can_ad_slug
+yahoo.com#@#.ad_slug_table
+yahoo.com#@#.ad-tl1
+
+||csc.beap.bc.yahoo.com^
+
+! Yahoo display ads (https://adblockplus.org/forum/viewtopic.php?p=157308#p157308)
+yahoo.com#@##my-adsLREC4-base
+@@||yahoo.com/sdarla/php/fc.php*^l=UBA$subdocument,domain=yahoo.com,document
+@@||na.ads.yahoo.com/yax/banner^*^asz=300x250*|UBA$subdocument,domain=s.yimg.com,document
+@@||na.ads.yahoo.com/yax/banner^*^asz=728x90*|UBA$subdocument,domain=s.yimg.com,document
+@@||na.ads.yahoo.com/yax/csc^$image,domain=s.yimg.com
+@@||s.yimg.com/rq/darla/*/html/r-csc.html$subdocument,domain=yahoo.com
+@@||csc.beap.bc.yahoo.com^*^ypos=UBA$image,domain=s.yimg.com
+||yahoo.com/px.gif?ch=2$domain=yahoo.com
+@@||yahoo.com/px.gif?ch=1$domain=yahoo.com
+@@||adserver.yahoo.com/a?$xmlhttprequest,domain=yahoo.com
+@@||yimg.com/rq/darla/i/fdb1.gif$domain=yahoo.com
+s.yimg.com#@#.ad_slug_table
+s.yimg.com#@#.CAN_ad
+
 ! tumblr.com ads (https://adblockplus.org/forum/viewtopic.php?f=12&t=47913)
 ||tumblr.com/assets/scripts/tumblr/dashboard/px.js?ch=2$domain=tumblr.com
 @@||tumblr.com/assets/scripts/tumblr/dashboard/px.js?ch=1$domain=tumblr.com
 tumblr.com#@#.standalone-ad-container
 @@||s.yimg.com/av/$domain=tumblr.com
 @@||pix.ny.us.criteo.net/img$domain=tumblr.com
 @@||assets.tumblr.com/images/sponsored_post_sprite_new.png$domain=tumblr.com
 @@||assets.tumblr.com/images/sponsored_post_sprite_new_2x.png$domain=tumblr.com