Browse code

make it much more obvious that the torbutton page isn't for users

Roger Dingledine authored on12/11/2011 23:39:58
Showing1 changed files
... ...
@@ -85,23 +85,42 @@
85 85
     
86 86
     <h2>Torbutton</h2>
87 87
     <hr>
88
-    
88
+
89
+    <p>
90
+    Torbutton is the component in <a href="<page projects/torbrowser>">Tor
91
+    Browser Bundle</a> that takes care of application-level
92
+    security and privacy concerns in Firefox.  To keep you safe,
93
+    Torbutton disables many types of active content.
94
+    </p>
95
+
96
+    <p>
97
+    Now that the <a href="<page projects/torbrowser>">Tor Browser
98
+    Bundle</a> includes a patched version of Firefox, and because we don't
99
+    have enough developer resources to keep up with the accelerated
100
+    Firefox release schedule, the toggle model of Torbutton is <a
101
+    href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no
102
+    longer recommended</a>. <b>Users should be using Tor Browser Bundle,
103
+    not installing Torbutton themselves.</b>
104
+    </p>
105
+
106
+    <br/><br/>
89 107
     <strong>Current stable version:</strong><version-torbutton><br/>
90 108
     <strong>Current alpha version:</strong><version-torbutton-alpha><br/>
91 109
     <br/>
92 110
     <strong>Maintainer:</strong> Mike Perry<br/>
93 111
     <br/>
94
-    <strong>Install Stable:</strong> Click to <a
112
+    <strong>Expert Install (Stable):</strong> Click to <a
95 113
     href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi"
96 114
     hash="<version-hash-torbutton>" onclick="return
97 115
     install(event);">install from this website</a>. Verify the <a href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi.asc">signature</a>.<br/>
98 116
 <!--
99
-    <strong>Install Alpha:</strong> Click to 
117
+    <strong>Expert Install (Alpha):</strong> Click to 
100 118
     <a href="https://www.torproject.org/dist/torbutton/torbutton-current-alpha.xpi"
101 119
       hash="<version-hash-torbutton-alpha>"
102 120
       onclick="return install(event);">install from this website</a>
103 121
     <br/>
104 122
   -->
123
+<!--
105 124
    <strong>English Google Search:</strong> 
106 125
     Google search plugins for
107 126
     <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
... ...
@@ -109,8 +128,8 @@
109 128
     <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
110 129
      onClick="addOpenSearch('googleuk_web','png','General','14445','g');return false">Google UK</a>.
111 130
     <br/>
131
+  -->
112 132
     <strong>Past Releases:</strong> <a href="https://archive.torproject.org/tor-package-archive/torbutton/">Tor Archive</a><br/>
113
-    <br/>
114 133
     <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/>
115 134
 
116 135
     <strong>Source:</strong> You can <a
... ...
@@ -119,47 +138,11 @@
119 138
     <br/>
120 139
     <strong>Bug Reports:</strong> <a href="https://trac.torproject.org/projects/tor/report/14">Torproject Bug Tracker</a><br/>
121 140
     <strong>Documents:</strong> <b>[</b> <a href="<page torbutton/torbutton-faq>">FAQ</a> <b>|</b>
141
+    <a href="<page torbutton/torbutton-options>">Torbutton options</a> <b>|</b>
122 142
     <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CHANGELOG">changelog</a> <b>|</b>
123 143
     <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/LICENSE">license</a> <b>|</b>
124
-    <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS">credits</a> <b>]</b><br/>
144
+    <a href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS">credits</a> <b>]</b>
125 145
     
126
-    <br/>
127
-    
128
-    <p>
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
-    Some users may prefer a toolbar button instead of a statusbar panel.
141
-    Torbutton lets you add a toolbar button by right-clicking
142
-    on the desired toolbar, selecting "Customize...", and then dragging the
143
-    Torbutton icon onto the toolbar.  There is an option in the preferences
144
-    to hide the statusbar panel (Tools-&gt;Extensions, select Torbutton,
145
-    and click on Preferences).
146
-    </p>
147
-
148
-    <p>
149
-    Originally Torbutton was a 1-click way for Firefox users to enable or disable
150
-    the browser's use of <a href="<page index>">Tor</a>.
151
-    (It adds a panel to the statusbar that says "Tor Enabled" (in green) or
152
-    "Tor Disabled" (in red).  The user may click on the panel to toggle
153
-    the status.  If the user (or some other extension) changes the proxy
154
-    settings, the change is automatically reflected in the statusbar.) But
155
-    now that the <a href="<page projects/torbrowser>">Tor Browser
156
-    Bundle</a> includes a patched version of Firefox, and because we don't
157
-    have enough developer resources to keep up with the accelerated
158
-    Firefox release schedule, the toggle model of Torbutton is <a
159
-    href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no
160
-    longer recommended</a>.
161
-    </p>
162
-
163 146
   </div>
164 147
   <!-- END MAINCOL -->
165 148
   <div id = "sidecol">