From 20b03052f5b96e82fa7c15e2dbd00e7953563bfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Abi=C3=A1n?= <da@davidabian.com>
Date: Wed, 23 Mar 2016 21:16:39 +0100
Subject: [PATCH 1/4] Create Vozpopuli.com.xml

See <https://github.com/EFForg/https-everywhere/pull/4446>.
---
 src/chrome/content/rules/Vozpopuli.com.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 src/chrome/content/rules/Vozpopuli.com.xml

diff --git a/src/chrome/content/rules/Vozpopuli.com.xml b/src/chrome/content/rules/Vozpopuli.com.xml
new file mode 100644
index 000000000000..e6654f04cda1
--- /dev/null
+++ b/src/chrome/content/rules/Vozpopuli.com.xml
@@ -0,0 +1,11 @@
+<ruleset name="VOZPOPULI.COM">
+
+	<target host="vozpopuli.com" />
+	<target host="tendencias.vozpopuli.com" />
+
+	<test url="http://tendencias.vozpopuli.com/" />
+
+	<rule from="^http:"
+		to="https:" />
+
+</ruleset>

From 44234a02240ee5fd0bb6584b0a4cfec00fef47c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Abi=C3=A1n?= <da@davidabian.com>
Date: Wed, 23 Mar 2016 21:19:35 +0100
Subject: [PATCH 2/4] Ruleset name

---
 src/chrome/content/rules/Vozpopuli.com.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/Vozpopuli.com.xml b/src/chrome/content/rules/Vozpopuli.com.xml
index e6654f04cda1..bcc9f593b019 100644
--- a/src/chrome/content/rules/Vozpopuli.com.xml
+++ b/src/chrome/content/rules/Vozpopuli.com.xml
@@ -1,4 +1,4 @@
-<ruleset name="VOZPOPULI.COM">
+<ruleset name="Vozpopuli.com">
 
 	<target host="vozpopuli.com" />
 	<target host="tendencias.vozpopuli.com" />

From a95682fd93f848ea493772d9957eaa6637780646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Abi=C3=A1n?= <da@davidabian.com>
Date: Thu, 24 Mar 2016 15:42:42 +0100
Subject: [PATCH 3/4] Update Vozpopuli.com.xml

---
 src/chrome/content/rules/Vozpopuli.com.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/Vozpopuli.com.xml b/src/chrome/content/rules/Vozpopuli.com.xml
index bcc9f593b019..4be81108b54d 100644
--- a/src/chrome/content/rules/Vozpopuli.com.xml
+++ b/src/chrome/content/rules/Vozpopuli.com.xml
@@ -1,8 +1,18 @@
 <ruleset name="Vozpopuli.com">
 
 	<target host="vozpopuli.com" />
+	<target host="www.vozpopuli.com" />
+	<target host="estatico.vozpopuli.com" />
 	<target host="tendencias.vozpopuli.com" />
-
+	<!--
+		Mismatched:
+		* social.vozpopuli.com
+		* gestion.vozpopuli.com
+		* bolsa.vozpopuli.com
+	-->
+	
+	<test url="http://www.vozpopuli.com/" />
+	<test url="http://estatico.vozpopuli.com/" />
 	<test url="http://tendencias.vozpopuli.com/" />
 
 	<rule from="^http:"

From 2a810cd673d8b76246eeb6963c61aedd5f4a15f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Abi=C3=A1n?= <da@davidabian.com>
Date: Thu, 24 Mar 2016 15:50:17 +0100
Subject: [PATCH 4/4] Update Vozpopuli.com.xml

Moving comments above and removing unnecessary test URLs.
---
 src/chrome/content/rules/Vozpopuli.com.xml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/chrome/content/rules/Vozpopuli.com.xml b/src/chrome/content/rules/Vozpopuli.com.xml
index 4be81108b54d..948394b9996c 100644
--- a/src/chrome/content/rules/Vozpopuli.com.xml
+++ b/src/chrome/content/rules/Vozpopuli.com.xml
@@ -1,19 +1,15 @@
+<!--
+	Mismatched:
+	* social.vozpopuli.com
+	* gestion.vozpopuli.com
+	* bolsa.vozpopuli.com
+-->
 <ruleset name="Vozpopuli.com">
 
 	<target host="vozpopuli.com" />
 	<target host="www.vozpopuli.com" />
 	<target host="estatico.vozpopuli.com" />
 	<target host="tendencias.vozpopuli.com" />
-	<!--
-		Mismatched:
-		* social.vozpopuli.com
-		* gestion.vozpopuli.com
-		* bolsa.vozpopuli.com
-	-->
-	
-	<test url="http://www.vozpopuli.com/" />
-	<test url="http://estatico.vozpopuli.com/" />
-	<test url="http://tendencias.vozpopuli.com/" />
 
 	<rule from="^http:"
 		to="https:" />