[tor-commits] r25205: {website} tell people that the torbutton toggle model is no longer rec (website/trunk/torbutton/en)

[Roger Dingledine]

Author: arma
Date: 2011-11-12 21:50:30 +0000 (Sat, 12 Nov 2011)
New Revision: 25205

Modified:
   website/trunk/torbutton/en/index.wml
Log:
tell people that the torbutton toggle model is no longer recommended


Modified: website/trunk/torbutton/en/index.wml
===================================================================
--- website/trunk/torbutton/en/index.wml	2011-11-12 21:23:58 UTC (rev 25204)
+++ website/trunk/torbutton/en/index.wml	2011-11-12 21:50:30 UTC (rev 25205)
@@ -126,22 +126,32 @@
     <br/>
     
     <p>
-    Torbutton is a 1-click way for Firefox users to enable or disable
+    Torbutton is the component in <a href="<page projects/torbrowser>">Tor
+    Browser Bundle</a> that takes care of application-level security
+    and privacy concerns in Firefox.  To keep you safe, Torbutton
+    disables many types of active content. You can learn more from
+    the <a href="en/design/index.html.en">Design Document</a>, the <a
+    href="<page torbutton/torbutton-faq>">Torbutton FAQ</a>, or read more
+    details in the <a href="<page torbutton/torbutton-options>">Torbutton
+    options</a> list.
+    </p>
+
+    <p>
+    Originally Torbutton was a 1-click way for Firefox users to enable or disable
     the browser's use of <a href="<page index>">Tor</a>.
-    It adds a panel to the statusbar that says "Tor Enabled" (in green) or
+    (It adds a panel to the statusbar that says "Tor Enabled" (in green) or
     "Tor Disabled" (in red).  The user may click on the panel to toggle
     the status.  If the user (or some other extension) changes the proxy
-    settings, the change is automatically reflected in the statusbar.
+    settings, the change is automatically reflected in the statusbar.) But
+    now that the <a href="<page projects/torbrowser>">Tor Browser
+    Bundle</a> includes a patched version of Firefox, and because we don't
+    have enough developer resources to keep up with the accelerated
+    Firefox release schedule, the toggle model of Torbutton is <a
+    href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no
+    longer recommended</a>.
     </p>
-    
+
     <p>
-    To keep you safe, Torbutton disables many types of active content. You
-    can learn more from the <a href="<page torbutton/torbutton-faq>">Torbutton FAQ</a>,
-    or read more details in the <a href="<page torbutton/torbutton-options>">Torbutton
-    options</a> list.
-    </p>
-    
-    <p>
     Some users may prefer a toolbar button instead of a statusbar panel.
     Torbutton lets you add a toolbar button by right-clicking
     on the desired toolbar, selecting "Customize...", and then dragging the
@@ -158,4 +168,5 @@
   <!-- END SIDECOL -->
 </div>
 <!-- END CONTENT -->
-#include <foot.wmi>      
+#include <foot.wmi>
+