Merge git://github.com/galenide/https-everywhere into galenide

diracdeltas · diracdeltas · commit 829b27894bcf · 2014-07-28T15:42:41.000-07:00
diff --git a/src/chrome/content/rules/Public-Knowledge.xml b/src/chrome/content/rules/Public-Knowledge.xml
@@ -0,0 +1,10 @@
+<ruleset name="Public Knowledge">
+	<target host="publicknowledge.org" />
+	<target host="www.publicknowledge.org" />
+
+	<securecookie host="(^|\.)publicknowledge\.org$"
+			name=".+" />
+
+	<rule from="^http://(www\.)?publicknowledge\.org/"
+		to="https://www.publicknowledge.org/" />
+</ruleset>
diff --git a/src/chrome/content/rules/Stanford-University.xml b/src/chrome/content/rules/Stanford-University.xml
@@ -65,6 +65,7 @@
 
 		- (www.)		(^ → www)
 		- accessories
+		- adminguide
 		- ai
 		- alumni
 		- annualreport
@@ -98,6 +99,7 @@
 		- npl
 		- openflow
 		- osep
+		- parents
 		- parentsweekend
 		- pgnet
 		- publicaffairs
@@ -126,6 +128,7 @@
 		- ucomm
 		- visit
 		- waivers
+		- web
 		- weblogin
 		- www-ee		(→ ee)
 
@@ -150,13 +153,13 @@
 
 
 	<!--securecookie host="^(\.cs|\.engineering)?\.stanford\.edu$" name=".+" /-->
-	<securecookie host="^(?:alumni|\.answers|ehsappprd1|hannahousetours|\.itservices|\.law|\.lbre|maven|openflow|pgnet|\.siepr|(?:\.news|www6)\.slac\|stanfordwho|weblogin|webauth1).stanford\.edu$" name=".+" />
+	<securecookie host="^(?:adminguide|alumni|\.answers|ehsappprd1|hannahousetours|\.itservices|\.law|\.lbre|maven|openflow|parents|pgnet|\.siepr|(?:\.news|www6)\.slac\|stanfordwho|weblogin|webauth1).stanford\.edu$" name=".+" />
 
 
 	<rule from="^https?://(?:www\.)?(slac\.)?stanford\.edu/"
 		to="https://www.$1stanford.edu/" />
 
-	<rule from="^http://(accessories|ai|alumni|annualreport|answers|assu-web|ccrma|crowd|crypto|ctr|cyberlaw|ehsappprd1|engineering|events|founders|hannahousetours|itservices|itunes|janestanford|(?:blogs\.|cch\.|www\.)?law|lbre|lists|mailman|maven|med|news|npl|openflow|osep|parentsweekend|pgnet|publicaffairs|refunds|remedyweb|siepr|(?:bbr-wiki|news|oraweb|webauth1|www[26]|www-conf|www-group|www-public)\.slac|stanford(?:events|who)|studentaffairs|ucomm|visit|waivers|weblogin|xenon)\.stanford\.edu/"
+	<rule from="^http://(accessories|adminguide|ai|alumni|annualreport|answers|assu-web|ccrma|crowd|crypto|ctr|cyberlaw|ehsappprd1|engineering|events|founders|hannahousetours|itservices|itunes|janestanford|(?:blogs\.|cch\.|www\.)?law|lbre|lists|mailman|maven|med|news|npl|openflow|osep|parents|parentsweekend|pgnet|publicaffairs|refunds|remedyweb|siepr|(?:bbr-wiki|news|oraweb|webauth1|www[26]|www-conf|www-group|www-public)\.slac|stanford(?:events|who)|studentaffairs|ucomm|visit|waivers|web|weblogin|xenon)\.stanford\.edu/"
 		to="https://$1.stanford.edu/" />
 
 	<rule from="^http://(?:www\.)?cs\.stanford\.edu/"
