From 01e415fd2993c996bb986b3d4f1b313551902b7f Mon Sep 17 00:00:00 2001
From: Marco129 <marco.website01@gmail.com>
Date: Sun, 7 May 2017 20:53:35 +0800
Subject: [PATCH 1/3] [gov.hk] Update ruleset

---
 src/chrome/content/rules/GovHK.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/chrome/content/rules/GovHK.xml b/src/chrome/content/rules/GovHK.xml
index 711a8fbdf8ab..3b559ffd65ba 100644
--- a/src/chrome/content/rules/GovHK.xml
+++ b/src/chrome/content/rules/GovHK.xml
@@ -16,9 +16,20 @@
 		- hongkongpost.gov.hk.xml
 		- jobs.gov.hk.xml
 		- voterinfo.gov.hk.xml
+
+	Nonfunctional hosts in *.gov.hk:
+		- theme.gov.hk (m)
+		- search.gov.hk (m)
+
+	h: http redirect
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
 -->
 <ruleset name="GovHK">
 	<target host="www.gov.hk" />
+	<target host="lp.search.gov.hk" />
 
 	<rule from="^http:" to="https:" />
 </ruleset>

From 7d1f11354871c35292375c29dd4b745cf2f77c42 Mon Sep 17 00:00:00 2001
From: Marco129 <marco.website01@gmail.com>
Date: Sun, 7 May 2017 21:01:40 +0800
Subject: [PATCH 2/3] [gov.hk] Add missing reference

---
 src/chrome/content/rules/1823.gov.hk.xml   | 2 ++
 src/chrome/content/rules/GovHK.xml         | 2 ++
 src/chrome/content/rules/hkwetlandpark.xml | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/src/chrome/content/rules/1823.gov.hk.xml b/src/chrome/content/rules/1823.gov.hk.xml
index 0deaecde6668..b6cea30a346b 100644
--- a/src/chrome/content/rules/1823.gov.hk.xml
+++ b/src/chrome/content/rules/1823.gov.hk.xml
@@ -1,4 +1,6 @@
 <!--
+	For other HK government coverage, see GovHK.xml.
+
 	Invalid certificate:
 		1823.gov.hk
 -->
diff --git a/src/chrome/content/rules/GovHK.xml b/src/chrome/content/rules/GovHK.xml
index 3b559ffd65ba..ca5af2458004 100644
--- a/src/chrome/content/rules/GovHK.xml
+++ b/src/chrome/content/rules/GovHK.xml
@@ -1,5 +1,6 @@
 <!--
 	Other HK government rulesets:
+		- 1823.gov.hk.xml
 		- data.gov.hk.xml
 		- heritage.gov.hk.xml
 		- HKGov-AFCD.xml
@@ -13,6 +14,7 @@
 		- HKGov-TID.xml
 		- hkpl.gov.hk.xml
 		- hkqf.gov.hk.xml
+		- hkwetlandpark.xml
 		- hongkongpost.gov.hk.xml
 		- jobs.gov.hk.xml
 		- voterinfo.gov.hk.xml
diff --git a/src/chrome/content/rules/hkwetlandpark.xml b/src/chrome/content/rules/hkwetlandpark.xml
index 00062cf51f64..68f9ffc1ff84 100644
--- a/src/chrome/content/rules/hkwetlandpark.xml
+++ b/src/chrome/content/rules/hkwetlandpark.xml
@@ -1,3 +1,6 @@
+<!--
+	For other HK government coverage, see GovHK.xml.
+-->
 <ruleset name="Hong Kong Wetland Park (partial)">
 
 	<target host="www.wetlandpark.gov.hk" />

From c7398edf680bf557fa3209d469153459e7f05201 Mon Sep 17 00:00:00 2001
From: Marco129 <marco.website01@gmail.com>
Date: Sun, 7 May 2017 21:15:54 +0800
Subject: [PATCH 3/3] Fix old rule

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

diff --git a/src/chrome/content/rules/hkwetlandpark.xml b/src/chrome/content/rules/hkwetlandpark.xml
index 68f9ffc1ff84..873191b56934 100644
--- a/src/chrome/content/rules/hkwetlandpark.xml
+++ b/src/chrome/content/rules/hkwetlandpark.xml
@@ -1,7 +1,7 @@
 <!--
 	For other HK government coverage, see GovHK.xml.
 -->
-<ruleset name="Hong Kong Wetland Park (partial)">
+<ruleset name="Hong Kong Wetland Park (partial)" default_off="missing certificate chain">
 
 	<target host="www.wetlandpark.gov.hk" />
 	<target host="wetlandpark.gov.hk" />