[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] r25207: {website} make it much more obvious that the torbutton page isn't for (website/trunk/torbutton/en)
Author: arma
Date: 2011-11-12 22:39:58 +0000 (Sat, 12 Nov 2011)
New Revision: 25207
Modified:
website/trunk/torbutton/en/index.wml
Log:
make it much more obvious that the torbutton page isn't for users
Modified: website/trunk/torbutton/en/index.wml
===================================================================
--- website/trunk/torbutton/en/index.wml 2011-11-12 21:56:42 UTC (rev 25206)
+++ website/trunk/torbutton/en/index.wml 2011-11-12 22:39:58 UTC (rev 25207)
@@ -85,23 +85,42 @@
<h2>Torbutton</h2>
<hr>
-
+
+ <p>
+ 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.
+ </p>
+
+ <p>
+ 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>. <b>Users should be using Tor Browser Bundle,
+ not installing Torbutton themselves.</b>
+ </p>
+
+ <br/><br/>
<strong>Current stable version:</strong><version-torbutton><br/>
<strong>Current alpha version:</strong><version-torbutton-alpha><br/>
<br/>
<strong>Maintainer:</strong> Mike Perry<br/>
<br/>
- <strong>Install Stable:</strong> Click to <a
+ <strong>Expert Install (Stable):</strong> Click to <a
href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi";
hash="<version-hash-torbutton>" onclick="return
install(event);">install from this website</a>. Verify the <a href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi.asc";>signature</a>.<br/>
<!--
- <strong>Install Alpha:</strong> Click to
+ <strong>Expert Install (Alpha):</strong> Click to
<a href="https://www.torproject.org/dist/torbutton/torbutton-current-alpha.xpi";
hash="<version-hash-torbutton-alpha>"
onclick="return install(event);">install from this website</a>
<br/>
-->
+<!--
<strong>English Google Search:</strong>
Google search plugins for
<a href="/jsreq.html" title="Ref: 14938 (googleCA)"
@@ -109,8 +128,8 @@
<a href="/jsreq.html" title="Ref: 14938 (googleCA)"
onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.
<br/>
+ -->
<strong>Past Releases:</strong> <a href="https://archive.torproject.org/tor-package-archive/torbutton/";>Tor Archive</a><br/>
- <br/>
<strong>Developer Documentation:</strong> <a href="en/design/index.html.en">Torbutton Design Document</a> and <a href="en/design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>
<strong>Source:</strong> You can <a
@@ -119,47 +138,11 @@
<br/>
<strong>Bug Reports:</strong> <a href="https://trac.torproject.org/projects/tor/report/14";>Torproject Bug Tracker</a><br/>
<strong>Documents:</strong> <b>[</b> <a href="<page torbutton/torbutton-faq>">FAQ</a> <b>|</b>
+ <a href="<page torbutton/torbutton-options>">Torbutton options</a> <b>|</b>
<a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CHANGELOG";>changelog</a> <b>|</b>
<a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/LICENSE";>license</a> <b>|</b>
- <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS";>credits</a> <b>]</b><br/>
+ <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS";>credits</a> <b>]</b>
- <br/>
-
- <p>
- 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>
- 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
- Torbutton icon onto the toolbar. There is an option in the preferences
- to hide the statusbar panel (Tools->Extensions, select Torbutton,
- and click on Preferences).
- </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
- "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.) 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>
-
</div>
<!-- END MAINCOL -->
<div id = "sidecol">
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits