tor-webwml.git

Rewrite of the download page to put relevant info before the fold, tease the user about wanting tor to really work before the fold, clean up the download tables and make it easier to find packages.
Parent b9c9649a1
Andrew Lewman

Andrew Lewman commited on 2008-03-08 05:36:22
Zeige 1 geänderte Dateien mit 172 Einfügungen und 112 Löschungen.

en/download.wml
Zeige Datei @ 78ba45f67
... ... 
@@ -2,73 +2,130 @@
2 2 
 # Revision: $Revision$
3 3 
 # Translation-Priority: 1-high
4 4
5 
-#include "head.wmi" TITLE="Tor: Download"
5 
+#include "head.wmi" TITLE="Tor: Download" charset="UTF-8"
6 6
7 7 
 <div class="main-column">
8 8
9 
-<h2>Download current Tor version</h2>
9 
+<h2>Available Tor Bundles</h2>
10 10
11 11 
 <hr />
12 12
13 
-<p>
14 
-Tor is distributed as <a href="http://www.fsf.org/">Free Software</a>
15 
-under the <a href="<svnsandbox>LICENSE">3-clause BSD license</a>. The
16 
-bundles also include <a href="http://vidalia-project.net/">Vidalia</a>
17 
-and <a href="http://www.privoxy.org/">Privoxy</a>, which are supporting
18 
-applications distributed under the GNU GPL.
19 
-</p>
20 
-
21 
-<p>
22 
-There is no fee for installing Tor or using the Tor network, but
23 
-if you want Tor to become faster and more usable please consider
24 
-<a href="<page donate>">making a tax-deductible donation to The Tor Project</a>.
25 
-</p>
26 
-
27 
-<table width="100%" border="1" cellspacing="0" cellpadding="2">
13 
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
28 14 
 <thead>
29 
-<tr>
15 
+<tr bgcolor="#e5e5e5">
30 16 
 <th>Platform</th>
31 
-<th>Package</th>
17 
+<th>Download Stable</th>
18 
+<th>Download Unstable</th>
19 
+<th>Help</th>
32 20 
 </tr>
33 21 
 </thead>
34 22
35 23 
 <tr>
36 
-<td>Windows<br /><a href="<page docs/tor-doc-windows>">Install &amp; configure guide</a></td>
37 24 
   <td>
38 
-Tor &amp; Privoxy &amp; Vidalia &amp; Torbutton bundle:
25 
+    Windows<br />
26 
+    All Vista Versions, XP, 2000, 2003 Server, Millenium
27 
+  </td>
28 
+  <td>
39 29 
     <a href="<package-win32-bundle-stable>"><version-win32-bundle-stable></a> (<a href="<package-win32-bundle-stable-sig>">sig</a>)
40 30 
   </td>
31 
+  <td>
32 
+    <a href="<package-win32-bundle-alpha>"><version-win32-bundle-alpha></a> (<a href="<package-win32-bundle-alpha-sig>">sig</a>)
33 
+  </td>
34 
+  <td>
35 
+    <a href="<page docs/tor-doc-windows>">Install &amp; configure guide</a>
36 
+  <td>
41 37 
 </tr>
42 38
43 
-<tr>
39 
+<tr bgcolor="#e5e5e5">
44 40 
   <td>
45 41 
     Mac OS X<br />
46 
-<a href="<page docs/tor-doc-osx>">Install &amp; configure guide</a>
42 
+    Universal Binary (OSX 10.4 &amp; 10.5)
47 43 
   </td>
48 
-
49 44 
   <td>
50 
-Tor &amp; Privoxy &amp; Vidalia &amp; Torbutton bundle:<br />
51 
-&nbsp;&nbsp;&nbsp; Universal Binary (OSX 10.4 &amp; 10.5):
52 45 
     <a href="<package-osx-bundle-stable>"><version-osx-bundle-stable></a> (<a href="<package-osx-bundle-stable-sig>">sig</a>)
53 
-
54 
-<br />
55 
-&nbsp;&nbsp;&nbsp; 10.3 (Panther):
56 
-<a href="<package-oldosx-bundle-stable>"><version-oldosx-bundle-stable></a> (<a
57 
-href="<package-oldosx-bundle-stable-sig>">sig</a>)
46 
+  </td>
47 
+  <td>
48 
+    <a href="<package-osx-bundle-alpha>"><version-osx-bundle-alpha></a> (<a href="<package-osx-bundle-alpha-sig>">sig</a>)
49 
+  </td>
50 
+  <td>
51 
+    <a href="<page docs/tor-doc-osx>">Install &amp; configure guide</a>
58 52 
   </td>
59 53 
 </tr>
60 54
61 55 
 <tr>
62 56 
   <td>
63 
-Linux/Unix packages
57 
+    Mac OS X<br />
58 
+    10.3 (Panther)
59 
+  </td>
60 
+  <td>
61 
+    <a href="<package-oldosx-bundle-stable>"><version-oldosx-bundle-stable></a> (<a href="<package-oldosx-bundle-stable-sig>">sig</a>)
62 
+  </td>
63 
+  <td>
64 
+    <a href="<package-oldosx-alpha>"><version-oldosx-alpha></a> (<a href="<package-oldosx-alpha-sig>">sig</a>)
65 
+  </td>
66 
+  <td>
67 
+    <a href="<page docs/tor-doc-osx>">Install &amp; configure guide</a>
64 68 
   </td>
65 
-<td><a href="<page download-unix>">Linux/Unix download page</a></td>
66 69 
 </tr>
67 70
71 
+<tr bgcolor="#e5e5e5">
72 
+  <td>
73 
+    Linux/Unix packages<br />
74 
+    Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE
75 
+  </td>
76 
+  <td colspan="2">
77 
+    <a href="<page download-unix>">Linux/Unix download page</a>
78 
+  </td>
79 
+  <td>
80 
+    <a href="<page docs/tor-doc-unix>">Install &amp; configure guide</a>
81 
+  </td>
82 
+</tr>
68 83 
 </table>
69 84
70 85 
 <br />
71 86
87 
+<p>
88 
+What's the <a href="#packagediff">difference between Stable &amp; Unstable</a>?
89 
+</p>
90 
+
91 
+<p>
92 
+Tor is distributed as <a href="http://www.fsf.org/">Free Software</a>
93 
+under the <a href="<svnsandbox>LICENSE">3-clause BSD license</a>. The
94 
+bundles also include <a href="http://vidalia-project.net/">Vidalia</a>
95 
+and <a href="http://www.privoxy.org/">Privoxy</a>, which are supporting
96 
+applications distributed under the GNU GPL.
97 
+</p>
98 
+
99 
+<p>
100 
+There is no fee for installing Tor, or using the Tor network, but
101 
+if you want Tor to become faster and more usable please consider
102 
+<a href="<page donate>">making a tax-deductible donation to The Tor Project</a>.
103 
+</p>
104 
+
105 
+<p>Be smart and learn more. Understand what Tor does and does not offer.
106 
+This list of pitfalls isn't complete, and we need your
107 
+help <a href="<page volunteer>#Documentation">identifying and documenting
108 
+all the issues</a>.
109 
+</p>
110 
+
111 
+<p>
112 
+To keep informed of security advisories and new stable releases, subscribe
113 
+to the <a href="http://archives.seul.org/or/announce/">or-announce
114 
+mailing list</a> (you will be asked to confirm via email). You can also
115 
+<a href="http://rss.gmane.org/gmane.network.onion-routing.announce">watch
116 
+the list's RSS feed</a>.
117 
+</p>
118 
+
119 
+<form action="http://freehaven.net/cgi-bin/majordomo.cgi">
120 
+<input type="hidden" name="mlist" value="or-announce">
121 
+<input type="hidden" name="subscribe" value="1">
122 
+<input type="hidden" name="host" value="freehaven.net">
123 
+<input name="email" size="15">
124 
+<input type="submit" value="subscribe to or-announce">
125 
+</form>
126 
+
127 
+<br />
128 
+
72 129 
 <a id="Warning"></a>
73 130 
 <h2><a class="anchor" href="#Warning">Warning: Want Tor to really
74 131 
 work?</a></h2>
... ... 
@@ -80,14 +137,16 @@ There are several major pitfalls to watch out for:
80 137 
 </p>
81 138
82 139 
 <ol>
83 
-<li>Tor only protects Internet applications that are configured to
140 
+<li>
141 
+Tor only protects Internet applications that are configured to
84 142 
 send their traffic through Tor &mdash; it doesn't magically anonymize
85 143 
 all your traffic just because you install it.  We recommend you
86 144 
 use <a href="http://www.mozilla.org/firefox">Firefox</a> with the <a
87 145 
 href="https://addons.mozilla.org/firefox/2275/">Torbutton</a> extension.
88 146 
 </li>
89 147
90 
-<li>Browser plugins such as Java, Flash, ActiveX, RealPlayer,
148 
+<li>
149 
+Browser plugins such as Java, Flash, ActiveX, RealPlayer,
91 150 
 Quicktime, Adobe's PDF plugin, and others can be manipulated
92 151 
 into revealing your IP address. You should probably
93 152 
 <a href="http://plugindoc.mozdev.org/faqs/uninstall.html">uninstall your
... ... 
@@ -102,14 +161,16 @@ as they may bypass Tor and/or broadcast sensitive information. Some
102 161 
 people prefer using two browsers (one for Tor, one for unsafe browsing).
103 162 
 </li>
104 163
105 
-<li>Beware of cookies: if you ever browse without Tor and Privoxy
164 
+<li>
165 
+Beware of cookies: if you ever browse without Tor and Privoxy
106 166 
 and a site gives you a cookie, that cookie could identify you even when
107 167 
 you start using Tor again. You should clear your cookies frequently. <a
108 168 
 href="https://addons.mozilla.org/firefox/82/">CookieCuller</a> can help
109 169 
 protect any cookies you do not want to lose.
110 170 
 </li>
111 171
112 
-<li>Tor anonymizes the origin of your traffic,
172 
+<li>
173 
+Tor anonymizes the origin of your traffic,
113 174 
 and it encrypts everything inside the Tor network, but <a
114 175 
 href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers">it
115 176 
 can't encrypt your traffic between the Tor network and its final
... ... 
@@ -119,7 +180,8 @@ care as you would on the normal scary Internet &mdash; use HTTPS or other
119 180 
 end-to-end encryption and authentication.
120 181 
 </li>
121 182
122 
-<li>While Tor blocks attackers
183 
+<li>
184 
+While Tor blocks attackers
123 185 
 on your local network from discovering or influencing your destination,
124 186 
 it opens new risks: malicious or misconfigured Tor exit nodes can send
125 187 
 you the wrong page, or even send you embedded Java applets disguised as
... ... 
@@ -127,105 +189,99 @@ domains you trust.
127 189 
 </li>
128 190 
 </ol>
129 191
130 
-<p>Be smart and learn more. Understand what Tor does and does not offer.
131 
-This list of pitfalls isn't complete, and we need your
132 
-help <a href="<page volunteer>#Documentation">identifying and documenting
133 
-all the issues</a>.
134 
-</p>
192 
+<hr />
193 
+
194 
+<a id="packagediff"></a>
195 
+<h2><a class="anchor" href="#packagediff"></a>What's the difference between Stable &amp; Unstable?</h2>
135 196
136 197 
 <p>
137 
-To keep informed of security advisories and new stable releases, subscribe
138 
-to the <a href="http://archives.seul.org/or/announce/">or-announce
139 
-mailing list</a> (you will be asked to confirm via email). You can also
140 
-<a href="http://rss.gmane.org/gmane.network.onion-routing.announce">watch
141 
-the list's RSS feed</a>.
198 
+Stable packages are released when we believe the features and code will
199 
+not change for many months. These typically include a stable version of Vidalia, Privoxy, and Torbutton.
200 
+</p>
201 
+<p>
202 
+Unstable packages are released so you can help us test new features and bugfixes. Even though they have a higher version number
203 
+than the stable versions listed above, there is a much higher chance of
204 
+serious reliability and security bugs in these downloads. Newer,
205 
+untested versions of Vidalia, Privoxy, and Torbutton are included in
206 
+these unstable package. Please be prepared to <a href="https://bugs.torproject.org/">report bugs</a>.
142 207 
 </p>
143 
-
144 
-<form action="http://freehaven.net/cgi-bin/majordomo.cgi">
145 
-<input type="hidden" name="mlist" value="or-announce">
146 
-<input type="hidden" name="subscribe" value="1">
147 
-<input type="hidden" name="host" value="freehaven.net">
148 
-<input name="email" size="15">
149 
-<input type="submit" value="subscribe to or-announce">
150 
-</form>
151 
-
152 
-<hr />
153 208
154 209 
 <a id="Dev"></a>
155 
-<h2><a class="anchor" href="#Dev">Development releases, packages for
156 
-experts, and source code</a></h2>
210 
+<h2><a class="anchor" href="#Dev">Expert Packages &amp; Source Code </a></h2>
157 211
158 212 
 <p>
159 
-These development snapshots are released so you can help us test new
160 
-features and bugfixes. Even though they have a higher version number
161 
-than the stable versions listed above, there is a much higher chance
162 
-of serious reliability and security bugs in these downloads. Please be
163 
-prepared to <a href="https://bugs.torproject.org/">report bugs</a>.
213 
+Expert packages do not contain Vidalia.  Privoxy and Torbutton are installed pre-configured for you.  You must configure Tor itself through your own editor.
164 214 
 </p>
165 215
166 
-<table width="100%" border="1" cellspacing="0" cellpadding="2">
216 
+<table width="100%" border="0" cellspacing="0" cellpadding="2">
167 217 
 <thead>
168 
-<tr>
218 
+<tr bgcolor="e5e5e5">
169 219 
 <th>Platform</th>
170 
-<th>Package</th>
220 
+<th>Stable</th>
221 
+<th>Unstable</th>
222 
+<th>Help</th>
171 223 
 </tr>
172 224 
 </thead>
173 225
174 226 
 <tr>
175 
-<td>Windows<br /><a href="<page docs/tor-doc-windows>">Install &amp; configure guide</a></td>
176 227 
   <td>
177 
-Tor &amp; Privoxy &amp; Vidalia &amp; <a
178 
-href="https://torbutton.torproject.org/dev/">Torbutton-dev</a> bundle
179 
-(recommended):
180 
-<a href="<package-win32-bundle-alpha>"><version-win32-bundle-alpha></a> (<a href="<package-win32-bundle-alpha-sig>">sig</a>)
181 
-<br />
182 
-Expert install:
183 
-<a href="<package-win32-stable>"><version-win32-stable></a>
184 
-(<a href="<package-win32-stable-sig>">sig</a>),
185 
-<a href="<package-win32-alpha>"><version-win32-alpha></a>
186 
-(<a href="<package-win32-alpha-sig>">sig</a>)
228 
+    Windows<br />
229 
+    All Vista Versions, XP, 2000, 2003 Server, Millenium
230 
+  </td>
231 
+  <td>
232 
+    <a href="<package-win32-stable>"><version-win32-stable></a> (<a href="<package-win32-stable-sig>">sig</a>)
233 
+  </td>
234 
+  <td>
235 
+    <a href="<package-win32-alpha>"><version-win32-alpha></a> (<a href="<package-win32-alpha-sig>">sig</a>)
236 
+  </td>
237 
+  <td>
238 
+    <a href="<page docs/tor-doc-windows>">Install &amp; configure guide</a>
187 239 
   </td>
188 240 
 </tr>
189 241
190 
-<tr>
242 
+<tr bgcolor="#e5e5e5">
191 243 
   <td>
192 244 
     Mac OS X<br />
193 
-<a href="<page docs/tor-doc-osx>">Install &amp; configure guide</a>
245 
+    Universal Binary (OSX 10.4 &amp; 10.5)
246 
+  </td>
247 
+  <td>
248 
+    <a href="<package-osx-stable>"><version-osx-stable></a> (<a href="<package-osx-stable-sig>">sig</a>)
194 249 
   </td>
195 
-
196 250 
   <td>
197 
-Tor &amp; Privoxy &amp; Vidalia &amp; <a
198 
-href="https://torbutton.torproject.org/dev/">Torbutton-dev</a> bundle
199 
-(recommended):<br />
200 
-&nbsp;&nbsp;&nbsp; Universal Binary (10.4 &amp; 10.5):
201 
-<a href="<package-osx-bundle-alpha>"><version-osx-bundle-alpha></a> (<a href="<package-osx-bundle-alpha-sig>">sig</a>)
202 
-
203 
-<br />
204 
-&nbsp;&nbsp;&nbsp; 10.3 (Panther):
205 
-<a href="<package-oldosx-bundle-alpha>"><version-oldosx-bundle-alpha></a> (<a
206 
-href="<package-oldosx-bundle-alpha-sig>">sig</a>)
207 
-
208 
-<br />
209 
-Packages for experts:
210 
-Tor &amp; Privoxy &amp; Torbutton only:<br />
211 
-&nbsp;&nbsp;&nbsp; Universal Binary (OSX 10.4 &amp; 10.5):
212 
-<a href="<package-osx-stable>"><version-osx-stable></a> (<a href="<package-osx-stable-sig>">sig</a>),
213 251 
     <a href="<package-osx-alpha>"><version-osx-alpha></a> (<a href="<package-osx-alpha-sig>">sig</a>)
214 
-
215 
-<br />
216 
-&nbsp;&nbsp;&nbsp; 10.3 (Panther):
217 
-<a href="<package-oldosx-stable>"><version-oldosx-stable></a> (<a
218 
-href="<package-oldosx-stable-sig>">sig</a>),
219 
-<a href="<package-oldosx-alpha>"><version-oldosx-alpha></a> (<a
220 
-href="<package-oldosx-alpha-sig>">sig</a>)
252 
+  </td>
253 
+  <td>
254 
+    <a href="<page docs/tor-doc-osx>">Install &amp; configure guide</a>
221 255 
   </td>
222 256 
 </tr>
223 257
224 258 
 <tr>
225 259 
   <td>
226 
-Linux/Unix packages
260 
+    Mac OS X<br />
261 
+    10.3 (Panther)
262 
+  </td>
263 
+  <td>
264 
+    <a href="<package-oldosx-stable>"><version-oldosx-stable></a> (<ahref="<package-oldosx-stable-sig>">sig</a>)
265 
+  </td>
266 
+  <td>
267 
+    <a href="<package-oldosx-alpha>"><version-oldosx-alpha></a> (<a href="<package-oldosx-alpha-sig>">sig</a>)
268 
+  </td>
269 
+  <td>
270 
+    <a href="<page docs/tor-doc-osx>">Install &amp; configure guide</a>
271 
+  </td>
272 
+</tr>
273 
+
274 
+<tr bgcolor="#e5e5e5">
275 
+  <td>
276 
+    Linux/Unix packages<br />
277 
+    Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE
278 
+  </td>
279 
+  <td colspan="2">
280 
+    <a href="<page download-unix>">Linux/Unix download page</a>
281 
+  </td>
282 
+  <td>
283 
+    <a href="<page docs/tor-doc-unix>">Install &amp; configure guide</a>
227 284 
   </td>
228 
-<td><a href="<page download-unix>">Linux/Unix download page</a></td>
229 285 
 </tr>
230 286
231 287 
 <tr>
... ... 
@@ -234,16 +290,20 @@ Source tarballs<br />
234 290 
     <kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>
235 291 
   </td>
236 292 
   <td>
237 
-Stable: <a href="<package-source-stable>"><version-stable></a> (<a href="<package-source-stable-sig>">sig</a>)<br />
238 
-Alpha: <a href="<package-source-alpha>"><version-alpha></a> (<a href="<package-source-alpha-sig>">sig</a>)
293 
+    <a href="<package-source-stable>"><version-stable></a> (<a href="<package-source-stable-sig>">sig</a>)
239 294 
   </td>
240 
-</tr>
295 
+  <td>
296 
+    <a href="<package-source-alpha>"><version-alpha></a> (<a href="<package-source-alpha-sig>">sig</a>)
297 
+  </td>
298 
+  <td>
241 299
300 
+</tr>
242 301 
 </table>
243 302
303 
+<br />
304 
+
244 305 
 <p>
245 
-See our <a
246 
-href="https://wiki.torproject.org/noreply/TheOnionRouter/VerifyingSignatures">FAQ
306 
+See our <a href="https://wiki.torproject.org/noreply/TheOnionRouter/VerifyingSignatures">FAQ
247 307 
 entry on verifying package signatures</a>, which allows
248 308 
 you to make sure you've downloaded the file we intended you to get.
249 309 
 </p>
250 310