# HG changeset patch
# User MonztA <arthur@adblockplus.org>
# Date 1509720255 -3600
# Node ID a1df5f70282a8c24fda62042f02477ca4d8f0836
# Parent  2aa775998280eb3abfee4448e2de4ed841ed2a5f
Moved some whitelists for exceptionrules-minimal-no-third-party-tracking.txt to exceptionrules-minimal.txt

diff --git a/exceptionrules/exceptionrules-minimal-no-third-party-tracking.txt b/exceptionrules/exceptionrules-minimal-no-third-party-tracking.txt
--- a/exceptionrules/exceptionrules-minimal-no-third-party-tracking.txt
+++ b/exceptionrules/exceptionrules-minimal-no-third-party-tracking.txt
@@ -3,17 +3,16 @@
 ||bing.com/fd/ls/l?BF=MSJ1&$domain=bing.com
 @@||bing.com/fd/ls/l?BF=MSJ0&$domain=bing.com
 
 ! Yahoo search/in-feed ads (https://adblockplus.org/forum/viewtopic.php?f=12&t=18121)
 @@||l.yimg.com/pv/static/misc/sme/abp/w.gif$domain=yahoo.com
 ||l.yimg.com/pv/static/misc/sme/abp/b.gif$domain=yahoo.com
 @@||geo.yahoo.com/p?AB_TYPE=w$domain=yahoo.com
 ||geo.yahoo.com/p?AB_TYPE=b$domain=yahoo.com
-@@||doubleclick.net/clk^$popup,domain=search.yahoo.com
 @@||dmros.ysm.yahoo.com/ros/$domain=search.yahoo.com
 @@||r.search.yahoo.com/_ylt=*;_ylu=*.r.msn.com$popup,domain=search.yahoo.com
 @@||r.search.yahoo.com/_ylt=*;_ylu=*.bat.bing.com$popup,domain=search.yahoo.com
 @@||yimg.com^*^pid=Ads^$domain=search.yahoo.com
 @@||search.yahoo.com^$elemhide
 
 yahoo.com,~mail.yahoo.com#@#.rmx-ad
 yahoo.com,~mail.yahoo.com#@#.adlink
@@ -33,19 +32,16 @@ yahoo.com,~mail.yahoo.com#@#div[style*="
 @@||yahoo.com/s.yimg.com/av/curveball/ads/$image,domain=~mail.yahoo.com
 @@||yahoo.com/sy/av/moneyball/ads/$image,domain=~mail.yahoo.com
 @@||yimg.com/av/curveball/ads/$image,domain=yahoo.com|~mail.yahoo.com
 @@||yimg.com^*.yimg.com/av/curveball/ads/$image,domain=yahoo.com|~mail.yahoo.com
 @@||yahoo.com/sy/ts/api/res/*yimg.com/av/curveball/ads/pr/$image,domain=yahoo.com|~mail.yahoo.com
 @@||yahoo.com/sy/uu/api/res/*yimg.com/av/curveball/ads/pr/$image,domain=yahoo.com|~mail.yahoo.com
 @@||yahoo.com/sy/ny/api/res/*yimg.com/av/curveball/ads/pr/$image,domain=yahoo.com|~mail.yahoo.com
 @@||beap.gemini.yahoo.com^$domain=yahoo.com|~mail.yahoo.com
-@@||doubleclick.net/clk;$popup,domain=yahoo.com
-@@||track.adform.net^$popup,domain=yahoo.com
-@@||mediaplex.com/ad/ck/$popup,domain=yahoo.com
 ||yimg.com/gemini/pr/video_$domain=yahoo.com
 shopping.yahoo.com#@#.shmod-ysm
 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
@@ -55,21 +51,18 @@ yahoo.com##.ysab
 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=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
 
 nachrichten.yahoo.com#@#[data-ad-enhanced="card"]
 nachrichten.yahoo.com#@#.ad-source
diff --git a/exceptionrules/exceptionrules-minimal.txt b/exceptionrules/exceptionrules-minimal.txt
--- a/exceptionrules/exceptionrules-minimal.txt
+++ b/exceptionrules/exceptionrules-minimal.txt
@@ -2438,16 +2438,21 @@ search.yahoo.com#@##right > div:first-ch
 !A99
 @@||avito.ru^$elemhide
 @@||google.com/uds/$script,subdocument,document,domain=avito.ru
 @@||google.com/afs/$script,subdocument,document,domain=avito.ru
 @@||google.com/ads$domain=avito.ru
 
 ! Yahoo search/in-feed ads (https://adblockplus.org/forum/viewtopic.php?f=12&t=18121)
 @@||bing.com/th?*^pid=Ads^$image,domain=search.yahoo.com
+@@||doubleclick.net/clk^$popup,domain=search.yahoo.com
+
+@@||doubleclick.net/clk;$popup,domain=yahoo.com
+@@||track.adform.net^$popup,domain=yahoo.com
+@@||mediaplex.com/ad/ck/$popup,domain=yahoo.com
 
 @@||partnerads.ysm.yahoo.com/ypa/$document,subdocument,domain=everyauto.com|get-me-jobs.com|newarena.com|poba.com.tw|poba.hk|poke.com.tw|poke168.com|prizegrab.com|purelocal.com|sopeen.com|thenizzle.com|sweepstakesalerts.com|searchresults.car.com|obamacare-guide.org|socialwisdomtoday.com|duckhk.com
 @@||partnerads.ysm.yahoo.com/ypa/*&si=kiwsy_3%3A300x1%2Cp-kiwsy_1a%3A260x1$subdocument,domain=video.kiwsy.com.hk,document
 @@||partnerads.ysm.yahoo.com/ypa/*&si=towngag_3%3A300x1%2Cp-towngag_1%3A260x1%2Ctowngag_1a%3A260x1$subdocument,domain=towngag.com.hk,document
 @@||partnerads.ysm.yahoo.com/ypa/*&si=towngag_3%3A300x1%2Ctowngag_1%3A260x1%2Cp-towngag_1a%3A260x1$subdocument,domain=towngag.com.hk,document
 @@||everyauto.com^*/listings.php?$elemhide
 @@||get-me-jobs.com^*^q=$elemhide
 @@||poba.com.tw/search/$elemhide
@@ -2472,18 +2477,23 @@ answers.yahoo.com#@##ya-center-rail > [i
 answers.yahoo.com#@#.dmRosMBAdBox
 answers.yahoo.com#@#.dmRosMBAdBorder
 answers.yahoo.com#@#div[id^="dmRosAdWrapper"]
 @@||dmros1.ysm.yahoo.com/ros/$script,domain=answers.yahoo.com
 @@||doubleclick.net/ddm/*;sz=1x1;$image,domain=answers.yahoo.com
 @@||rover.ebay.com^*&size=1x1&$image,domain=answers.yahoo.com
 @@||2mdn.net/viewad/*-1x1.gif$image,domain=answers.yahoo.com
 
+! Yahoo display ads (https://adblockplus.org/forum/viewtopic.php?f=12&t=24361)
+@@||doubleclick.net/ddm/$popup,domain=yahoo.com
+
 ! Yahoo display ads (https://adblockplus.org/forum/viewtopic.php?p=142591#p142591)
 @@||criteo.com/delivery/lg.php?$domain=yahoo.com
+@@||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
 
 ! 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