Misc fixes.

jsha · jsha · commit 3d3f29e45eee · 2015-04-09T14:47:06.000-07:00
Formatting in rulesets.html (anchors go inside headings).
Makexpi package name corrections.
Disable HBO and HuffPo.
diff --git a/docs/rulesets.html b/docs/rulesets.html
@@ -14,9 +14,9 @@
   the extension, this guide will explain how to add that site.
 </p>
 
-<a name="rulesets" href="#rulesets">
-  <h4>Rulesets</h4>
-</a>
+<h4><a name="rulesets" href="#rulesets"
+  >Rulesets</a>
+</h4>
 
 <p>
   A <tt>ruleset</tt> is an <a
@@ -59,9 +59,9 @@ <h4>Rulesets</h4>
   according the the <tt>to</tt> attribute of the rule.
 </p>
 
-<a name="wildcard-targets" href="#wildcard-targets">
-  <h4>Wildcard Targets</h4>
-</a>
+<h4><a name="wildcard-targets" href="#wildcard-targets"
+  >Wildcard Targets</a>
+</h4>
 
 <p>
   To cover all of a domain&apos;s subdomains, you may want to specify
@@ -80,9 +80,10 @@ <h4>Wildcard Targets</h4>
   you should list each host as a separate target.
 </p>
 
-<a name="rules-and-regular-expressions" href="#rules-and-regular-expressions">
-  <h4>Rules and Regular Expressions</h4>
-</a>
+<h4>
+<a name="rules-and-regular-expressions" href="#rules-and-regular-expressions"
+  >Rules and Regular Expressions</a>
+</h4>
 
 <p>
   The <tt>rule</tt> tags do the actual rewriting work. The <tt>from</tt> attribute of
@@ -151,9 +152,9 @@ <h4>Rules and Regular Expressions</h4>
   rulesets will still be tried.
 </p>
 
-<a name="style" href="#style">
-  <h4>Style Guide</h4>
-</a>
+<h4><a name="style" href="#style"
+  >Style Guide</a>
+</h4>
 
 <p>
 There are many different ways you can write a ruleset, or regular expression
@@ -165,9 +166,9 @@ <h4>Style Guide</h4>
 testing</a> less cumbersome.
 </p>
 
-<a name="secure-cookies" href="#secure-cookies">
-  <h4>Secure Cookies</h4>
-</a>
+<h4><a name="secure-cookies" href="#secure-cookies"
+  >Secure Cookies</a>
+</h4>
 
 <p>
 Many HTTPS websites fail to correctly set the <a
@@ -191,9 +192,9 @@ <h4>Secure Cookies</h4>
 name made by stripping the leading dot.
 </p>
 
-<a name="testing" href="#testing">
-  <h4>Testing</h4>
-</a>
+<h4><a name="testing" href="#testing"
+  >Testing</a>
+</h4>
 
 <p>
 We use an <a href="https://github.com/hiviah/https-everywhere-checker">automated
@@ -231,9 +232,10 @@ <h4>Testing</h4>
   is a public and publicly-archived mailing list.
 </p>
 
-<a name="make-trivial" href="#make-trivial">
-  <h4>make-trivial-rule</h4>
-</a>
+<h4><a name="make-trivial" href="#make-trivial"
+  >make-trivial-rule</a>
+</h4>
+
 <p>
 As an alternative to writing rules by hand, there are scripts you
 can run from a Unix command line to automate the process of creating
@@ -242,9 +244,10 @@ <h4>make-trivial-rule</h4>
 repository and are described in <a href="https://www.eff.org/https-everywhere/development">our development
 documentation</a>.
 
-<a name="default-off" href="#default-off">
-  <h4>Disabling a ruleset by default</h4>
-</a>
+<h4><a name="default-off" href="#default-off"
+  >Disabling a ruleset by default</a>
+</h4>
+
 <p>
 Sometimes rulesets are useful or interesting, but cause problems
 that make them unsuitable for being enabled by default in everyone&apos;s
@@ -265,9 +268,9 @@ <h4>Disabling a ruleset by default</h4>
 file.
 </p>
 
-<a name="mixed-content" href="#mixed-content">
-  <h4>Mixed Content Blocking (MCB)</h4>
-</a>
+<h4><a name="mixed-content" href="#mixed-content"
+  >Mixed Content Blocking (MCB)</a>
+</h4>
 
 <p>
   Some rulesets may trigger active mixed content (i.e. scripts loaded over HTTP
@@ -285,9 +288,9 @@ <h4>Mixed Content Blocking (MCB)</h4>
   attribute to the ruleset element.
 </p>
 
-<a name="downgrades" href="#downgrades">
-  <h4>HTTPS-&gt;HTTP downgrade rules</h4>
-</a>
+<h4><a name="downgrades" href="#downgrades"
+  >HTTPS-&gt;HTTP downgrade rules</a>
+</h4>
 
 <p>
   By default, HTTPS Everywhere will refuse to allow rules that
diff --git a/makexpi.sh b/makexpi.sh
@@ -44,14 +44,9 @@ if [ -n "$1" ] && [ "$2" != "--no-recurse" ] && [ "$1" != "--fast" ] ; then
 
   # Now escape from the horrible mess we've made
   cd ..
-	XPI_NAME="$APP_NAME-$1"
-  # In this mad recursive situation, sometimes old buggy build scripts make
-  # the xpi as ./pkg :(
-  if ! cp $SUBDIR/pkg/$XPI_NAME pkg/ ; then
-    echo Recovering from hair-raising recursion:
-    echo cp $SUBDIR/pkg pkg/$XPI_NAME
-    cp $SUBDIR/pkg pkg/$XPI_NAME
-  fi
+  XPI_NAME="$APP_NAME-$1"
+  cp $SUBDIR/pkg/$XPI_NAME.xpi pkg/
+  cp $SUBDIR/pkg/$XPI_NAME-amo.xpi pkg/
   rm -rf $SUBDIR
   exit 0
 fi
diff --git a/src/chrome/content/rules/HBO.xml b/src/chrome/content/rules/HBO.xml
@@ -1,4 +1,5 @@
 <!--
+	Disabled per https://github.com/EFForg/https-everywhere/issues/1393
 	CDN buckets:
 
 		- i.lv3.hbo.com.c.footprint.net	
@@ -9,7 +10,7 @@
 		- i.lv3		(times out; data are also on www)
 
 -->
-<ruleset name="HBO">
+<ruleset name="HBO" default_off="Breaks videos">
 
 	<target host="hbo.com" />
 	<target host="*.hbo.com" />
diff --git a/src/chrome/content/rules/Huffington-Post.xml b/src/chrome/content/rules/Huffington-Post.xml
@@ -1,4 +1,5 @@
 <!--
+	Disabled per https://github.com/EFForg/https-everywhere/issues/1387
 	For problematic rules, see Huffington-Post-mismatches.xml.
 
 	For other AOL coverage, see AOL.xml.
@@ -98,7 +99,7 @@
 	** Unsecurable
 
 -->
-<ruleset name="Huffington Post (partial)">
+<ruleset name="Huffington Post (partial)" default_off="Breaks some images">
 
 	<target host="huffingtonpost.com" />
 	<target host="*.huffingtonpost.com" />
