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

pages/privacy.raw

Index: pages/privacy.raw
===================================================================
--- a/pages/privacy.raw
+++ b/pages/privacy.raw
@@ -1,127 +1,119 @@
 title=title-full
 
 
-<h2 id="general">$s1$</h2>	
+<h2 id="general">$s1$</h2>
 
 <p>
   $s2$
-  $s3$ $s4$ $s5$
 </p>
 
-<h2 id="website">$s6$</h2>
+<h2 id="website">$s3$</h2>
 
-<h3 id="logs">$s7$</h3>
+<h3 id="logs">$s4$</h3>
 
 <p>
-  $s8$ $s9$ $s10$ $s11$
+  $s5$
 </p>
 
-<h3 id="ips">$s12$</h3>
+<h3 id="ips">$s6$</h3>
 
 <p>
-  $s13$ $s14$ $s15$
+  $s7$
 </p>
 
-<h3 id="cookies">$s16$</h3>
+<h3 id="cookies">$s8$</h3>
 
 <p>
-  $s17$ $s18$
+  $s9$
 </p>
 
-<h3 id="forum_accounts">$s19$</h3>
+<h3 id="forum_accounts">$s10$</h3>
 
 <p>
-  $s20$ $s21$
+  $s11$
 </p>
 
 <ul>
   <li>
-    $s22$
-    $s23$
+    $s12$
   </li>
   <li>
-    $s24$
-    $s25$
+    $s13$
   </li>
 </ul>
 
 <p>
-  $s26$
+  $s14$
 </p>
 
-<h3 id="blog_comments">$s27$</h3>
+<h3 id="blog_comments">$s15$</h3>
 
 <p>
-  $s28(/blog/)$ $s29$
+  $s16(/blog/)$
 </p>
 
-<h2 id="abp">$s30$</h2>
+<h2 id="abp">$s17$</h2>
 
-<h3 id="abp_updates">$s31$</h3>
+<h3 id="abp_updates">$s18$</h3>
 
 <p>
-  $s32$ $s33$ $s34(#logs)$ $s35$ <a href="http://www.mozilla.com/en-US/legal/privacy/firefox-en.html">$s36$</a>$s37$ $s38(http://www.google.com/policies/privacy/)$ $s39$ <a href="http://www.opera.com/privacy#web">$s40$</a>$s41$
+  $s19(#logs, http://www.mozilla.com/en-US/legal/privacy/firefox-en.html, http://www.google.com/policies/privacy/, http://www.opera.com/privacy#web)$
 </p>
 
-<h3 id="abp_subscriptions">$s42$</h3>
+<h3 id="abp_subscriptions">$s20$</h3>
 
 <p>
-  $s43$ $s44$ $s45$
+  $s21$
 </p>
 
 <p>
-  $s46$ $s47$ $s48(#logs)$
+  $s22(#logs)$
 </p>
 
-<h3 id="abp_issue_reporter">$s49$</h3>
+<h3 id="abp_issue_reporter">$s23$</h3>
 
 <p>
-  $s50$ $s51$ $s52$ $s53$
+  $s24$
 </p>
 
 <ul>
   <li>
-    $s54$ $s55$
+    $s25$
   </li>
   <li>
-    $s56$
+    $s26$
   </li>
   <li>
-    $s57$
+    $s27$
   </li>
 </ul>
 
 <p>
-  $s58$
-  $s59$ $s60$
+  $s28$
 </p>
 
-<h3 id="abp_notifications">$s61$</h3>
+<h3 id="abp_notifications">$s29$</h3>
 
 <p>
-  $s62$ $s63$ $s64$ $s65(#logs)$
+  $s30(#logs)$
 </p>
 
-<h3 id="abp_website_requests">$s66$</h3>
+<h3 id="abp_website_requests">$s31$</h3>
 
 <p>
-  $s67$ $s68(#logs)$
+  $s32(#logs)$
 </p>
 
-<h3 id="abp_data">$s69$</h3>
+<h3 id="abp_data">$s33$</h3>
 
 <p>
-  $s70$
-  <a href="$s71$">$s72$</a>
-  $s73$ $s74(https://services.mozilla.com/privacy-policy/)$ $s75$ $s76$ $s77$ $s78$
-  <a href="$s79$">$s80$</a>
-  $s81$
+  $s34(http://support.mozilla.com/en-US/kb/Profiles, https://services.mozilla.com/privacy-policy/, http://support.mozilla.com/en-US/kb/Private+Browsing)$
 </p>
 
-<h2 id="ehh">$s82$</h2>
+<h2 id="ehh">$s35$</h2>
 
-<h3 id="ehh_updates">$s83$</h3>
+<h3 id="ehh_updates">$s18$</h3>
 
 <p>
-  $s84$ $s85$ $s86(#logs)$ $s87$ <a href="http://www.mozilla.com/en-US/legal/privacy/firefox-en.html">$s88$</a>$s89$
+  $s37(#logs, http://www.mozilla.com/en-US/legal/privacy/firefox-en.html)$
 </p>