Merge branch 'master' of github.com:EFForg/https-everywhere

jsha · jsha · commit 25284370bd44 · 2016-01-11T18:22:28.000-08:00
diff --git a/ruleset-testing.md b/ruleset-testing.md
@@ -30,17 +30,17 @@ target host with a left-side wildcard, and at least ten test URLs for each
 target host with a right-side wildcard. But this is not yet implemented.
 
 # Example:
-      <ruleset name="example.com">
-        <target host="example.com" />
-        <target host="*.example.com" />
+    <ruleset name="example.com">
+      <target host="example.com" />
+      <target host="*.example.com" />
 
-        <test url="http://www.example.com/" />
-        <test url="http://beta.example.com/" />
+      <test url="http://www.example.com/" />
+      <test url="http://beta.example.com/" />
 
-        <rule from="^http://([\w-]+\.)?dezeen\.com/"
-            to="https://$1dezeen.com/" />
+      <rule from="^http://([\w-]+\.)?dezeen\.com/"
+          to="https://$1dezeen.com/" />
 
-      </ruleset>
+    </ruleset>
 
 This ruleset has one implicit test URL from a target host
 ("http://example.com/"). The other target host has a wildcard, so creates no
@@ -63,4 +63,4 @@ a submodule of https-everywhere. To set it up, run:
 
 To test a specific ruleset:
 
-     ./fetch-test.sh rules/Example.xml
+    ./fetch-test.sh rules/Example.xml
diff --git a/src/chrome/content/rules/Octorate.xml b/src/chrome/content/rules/Octorate.xml
@@ -0,0 +1,9 @@
+<ruleset name="Octorate">
+	<target host=    "octorate.com" />
+	<target host="www.octorate.com" />
+
+  	<securecookie host="^(www\.)?octorate\.com$" name=".+" />
+
+	<rule from="^http:"
+		to="https:" />
+</ruleset>
