Browse code

tell people that the torbutton toggle model is no longer recommended

Roger Dingledine authored on12/11/2011 22:50:30
Showing1 changed files
... ...
@@ -126,21 +126,31 @@
126 126
     <br/>
127 127
     
128 128
     <p>
129
-    Torbutton is a 1-click way for Firefox users to enable or disable
129
+    Torbutton is the component in <a href="<page projects/torbrowser>">Tor
130
+    Browser Bundle</a> that takes care of application-level security
131
+    and privacy concerns in Firefox.  To keep you safe, Torbutton
132
+    disables many types of active content. You can learn more from
133
+    the <a href="en/design/index.html.en">Design Document</a>, the <a
134
+    href="<page torbutton/torbutton-faq>">Torbutton FAQ</a>, or read more
135
+    details in the <a href="<page torbutton/torbutton-options>">Torbutton
136
+    options</a> list.
137
+    </p>
138
+
139
+    <p>
140
+    Originally Torbutton was a 1-click way for Firefox users to enable or disable
130 141
     the browser's use of <a href="<page index>">Tor</a>.
131
-    It adds a panel to the statusbar that says "Tor Enabled" (in green) or
142
+    (It adds a panel to the statusbar that says "Tor Enabled" (in green) or
132 143
     "Tor Disabled" (in red).  The user may click on the panel to toggle
133 144
     the status.  If the user (or some other extension) changes the proxy
134
-    settings, the change is automatically reflected in the statusbar.
145
+    settings, the change is automatically reflected in the statusbar.) But
146
+    now that the <a href="<page projects/torbrowser>">Tor Browser
147
+    Bundle</a> includes a patched version of Firefox, and because we don't
148
+    have enough developer resources to keep up with the accelerated
149
+    Firefox release schedule, the toggle model of Torbutton is <a
150
+    href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no
151
+    longer recommended</a>.
135 152
     </p>
136
-    
137
-    <p>
138
-    To keep you safe, Torbutton disables many types of active content. You
139
-    can learn more from the <a href="<page torbutton/torbutton-faq>">Torbutton FAQ</a>,
140
-    or read more details in the <a href="<page torbutton/torbutton-options>">Torbutton
141
-    options</a> list.
142
-    </p>
143
-    
153
+
144 154
     <p>
145 155
     Some users may prefer a toolbar button instead of a statusbar panel.
146 156
     Torbutton lets you add a toolbar button by right-clicking
... ...
@@ -158,4 +168,5 @@
158 168
   <!-- END SIDECOL -->
159 169
 </div>
160 170
 <!-- END CONTENT -->
161
-#include <foot.wmi>      
171
+#include <foot.wmi>
172
+