[Freethought Blogs.com] Merge, squish, add/remove/update comments

MB · MB · commit f465eed8ea0d · 2015-03-16T15:00:00.000Z
diff --git a/src/chrome/content/rules/Freethought_Blogs.com-falsemixed.xml b/src/chrome/content/rules/Freethought_Blogs.com-falsemixed.xml
diff --git a/src/chrome/content/rules/Freethought_Blogs.com.xml b/src/chrome/content/rules/Freethought_Blogs.com.xml
@@ -1,26 +1,30 @@
 <!--
-	For rules causing false/broken MCB, see Freethought_Blogs.com-falsemixed.xml.
-
-
 	Mixed content:
 
-		- css from $self *
-		- Images from $self *
+		- Ads/bugs, from:
 
-	* Secured by us
+			- www.facebook.com
+			- ecx.images-amazon.com
+			- cdn.stumbleupon.com
+			- www.stumbleupon.com
+			- platform.twitter.com
+			- widgets.wp.com
 
 -->
 <ruleset name="Freethought Blogs.com (partial)">
 
 	<target host="freethoughtblogs.com" />
 	<target host="www.freethoughtblogs.com" />
-		<!--
-			Avoid false/broken MCB:
-						-->
-		<exclusion pattern="http://freethoughtblogs\.com/+(?!favicon\.ico|wp-content/|wp-includes/)" />
 
 
-	<rule from="^http://(www\.)?freethoughtblogs\.com/"
-		to="https://$1freethoughtblogs.com/" />
+	<!--	Not secured by server:
+					-->
+	<!--securecookie host="^\.freethoughtblogs\.com$" name="^(__cfduid|__qca|cf_clearance)$" /-->
+
+	<securecookie host="^\.freethoughtblogs\.com$" name=".+" />
+
+
+	<rule from="^http:"
+		to="https:" />
 
 </ruleset>
diff --git a/utils/duplicate-whitelist.txt b/utils/duplicate-whitelist.txt
@@ -78,7 +78,6 @@ foxydeal.com
 foxydeal.de
 freeporngif.com
 www.freeporngif.com
-freethoughtblogs.com
 frugalware-art.org
 g33kinfo.com
 geek.com
