Issue #1170 More progress migrating adblockplus.org to our CMS.

pages/about.raw

Index: pages/about.raw
===================================================================
--- a/pages/about.raw
+++ b/pages/about.raw
@@ -14,7 +14,7 @@
   var element = document.getElementById(targetId);
   var isVisible = element.style.display == "inherit";
   element.style.display = isVisible ? "none" : "inherit";
-  
+
   var textContainer = document.getElementById("expand-button-" + (isVisible ? "more" : "less"));
   if ("textContent" in button)
     button.textContent = textContainer.textContent;
@@ -29,7 +29,7 @@
   {
     display: none;
   }
-  
+
   .expandable
   {
     display: inherit;
@@ -44,85 +44,85 @@
 <h2 id="project">$s3$</h2>
 
 <p>
-  $s4(features)$ 50 $s5$ <a href="https://en.wikipedia.org/wiki/Adblock_Plus">$s6$</a>$s7(https://eyeo.com)$
+  $s4(features, https://en.wikipedia.org/wiki/Adblock_Plus, https://eyeo.com)$
 </p>
 
-<h2 id="workings">$s8$</h2>
+<h2 id="workings">$s5$</h2>
 
 <p>
-  $s9(features#tracking, features#malware)$
+  $s6(features#tracking, features#malware)$
 </p>
 
 <p>
-  $s10$
+  $s7$
   <ul>
-    <li>$s11$</li>
-    <li>$s12$</li>
+    <li>$s8$</li>
+    <li>$s9$</li>
   </ul>
 </p>
 
 <p>
-  $s13(filters)$
+  $s10(filters)$
 </p>
 
 <img src="images/how-adblock-plus-works.png">
 
-<h2 id="acceptableads">$s14$</h2>
+<h2 id="acceptableads">$s11$</h2>
 
 <p>
-  $s15(acceptable-ads#criteria, https://eyeo.com/acceptable-ads-application.html, acceptable-ads#optout)$
+  $s12(acceptable-ads#criteria, https://eyeo.com/acceptable-ads-application.html, acceptable-ads#optout)$
 </p>
 
 <p>
-  $s16(acceptable-ads)$
+  $s13(acceptable-ads)$
 </p>
 
-<h2 id="monetization">$s17$</h2>
+<h2 id="monetization">$s14$</h2>
 
 <p>
-  $s18$
+  $s15$
 </p>
 
-<button class="expand-button" onclick="toggleExpand(this, 'expand-monetization')">$s19$</button>
+<button class="expand-button" onclick="toggleExpand(this, 'expand-monetization')">$s1$</button>
 
 <div class="expandable" id="expand-monetization">
   <p>
-    $s20$ 
+    $s17$
   </p>
 
   <p>
-    $s21(acceptable-ads#criteria)$
+    $s18(acceptable-ads#criteria)$
   </p>
 
   <p>
-    $s22$
+    $s19$
   </p>
 </div>
 
-<h2 id="whymoney">$s23$</h2>
+<h2 id="whymoney">$s20$</h2>
 
 <p>
-  $s24(https://eyeo.com)$
+  $s21(https://eyeo.com)$
 </p>
 
-<button class="expand-button" onclick="toggleExpand(this, 'expand-whymoney')">$s25$</button>
+<button class="expand-button" onclick="toggleExpand(this, 'expand-whymoney')">$s1$</button>
 
 <div class="expandable" id="expand-whymoney">
   <p>
-    $s26(firefox, chrome, android, opera, internet-explorer, https://easylist.adblockplus.org)$
+    $s23(firefox, chrome, android, opera, internet-explorer, safari, https://easylist.adblockplus.org)$
   </p>
 
   <p>
-    $s27$ 
+    $s24$
   </p>
 
   <p>
-    $s28$
+    $s25$
   </p>
 </div>
 
-<h2 id="privacy">$s29$</h2>
+<h2 id="privacy">$s26$</h2>
 
 <p>
-  $s30(privacy)$
+  $s27(privacy)$
 </p>