Apply nile's patch for the new download page
Peter Palfrader

Peter Palfrader commited on 2005-12-05 19:33:37
Zeige 1 geänderte Dateien mit 114 Einfügungen und 46 Löschungen.

... ...
@@ -11,15 +11,13 @@
11 11
 <p>Tor is distributed as <a href="http://www.fsf.org/">Free Software</a>
12 12
 under the <a href="<cvssandbox>tor/LICENSE">3-clause BSD license</a>.</p>
13 13
 
14
-<p>You can get the latest release from the <a href="dist/">download
15
-directory</a>.
16
-The latest stable release is <b><version-stable></b>, and the
17
-latest development release is <b><version-alpha></b>.
18
-To keep informed of security advisories and new stable releases, subscribe
19
-to the <a href="http://archives.seul.org/or/announce/">or-announce
20
-mailing list</a>: (you will need to confirm via email)
21
-</p>
14
+<p>The latest stable release is <b><version-stable></b>, and the
15
+latest development release is <b><version-alpha></b>.</p>
22 16
 
17
+<p><b>Subscribe</b> to the 
18
+<a href="http://archives.seul.org/or/announce/">or-announce mailing list</a>
19
+to keep informed of security advisories and new stable releases (you will 
20
+need to confirm via email):
23 21
 <form action="http://freehaven.net/cgi-bin/majordomo.cgi">
24 22
 <input type="hidden" name="mlist" value="or-announce">
25 23
 <input type="hidden" name="subscribe" value="1">
... ...
@@ -27,51 +25,121 @@ mailing list</a>: (you will need to confirm via email)
27 25
 <input name="email" size="15">
28 26
 <input type="submit" value="subscribe">
29 27
 </form>
28
+</p>
30 29
 
31
-<p>Tor should run on Linux, BSD, OS X, Windows, Solaris, and more.</p>
32
-<ul>
33
-<li><b>Windows</b> installer:
34
-<a href="<package-win32-stable>"><version-win32-stable></a> (<a href="<package-win32-stable-sig>">sig</a>),
35
-<a href="<package-win32-alpha>"><version-win32-alpha></a> (<a href="<package-win32-alpha-sig>">sig</a>).
36
-Be sure to read the <a href="<cvssandbox>tor/doc/tor-doc-win32.html">Win32 Tor instructions</a>.</li>
37 30
 
38
-<li><b>Mac OS X Tiger</b> installer: 
31
+<table border="1" cellspacing="0" cellpadding="2">
32
+<tr>
33
+<td><strong>Platform</strong></td>
34
+<td><strong>Package</strong></td>
35
+<td><strong>Setup info</strong></td>
36
+</tr>
37
+
38
+<tr>
39
+<td>Windows</td>
40
+<td>
41
+<a href="<package-win32-stable>"><version-win32-stable></a> (<a href="<package-win32-stable-sig>">sig</a>),
42
+<a href="<package-win32-alpha>"><version-win32-alpha></a> (<a href="<package-win32-stable-sig>">sig</a>)
43
+</td>
44
+<td><a href="<cvssandbox>tor/doc/tor-doc-win32.html">Win32 instructions</a></td>
45
+</tr>
46
+
47
+<tr>
48
+<td>Mac OS X Tiger</td>
49
+<td>
39 50
 <a href="<package-osx-stable>"><version-osx-stable></a> (<a href="<package-osx-stable-sig>">sig</a>),
40
-<a href="<package-osx-alpha>"><version-osx-alpha></a> (<a href="<package-osx-alpha-sig>">sig</a>).
41
-Be sure to read the <a href="<cvssandbox>tor/doc/tor-doc-osx.html">OS X Tor instructions</a>.
42
-</li>
43
-
44
-<li><b>Mac OS X Panther/Jaguar</b> installer: 
45
-<a href="<package-oldosx-stable>"><version-oldosx-stable></a> (<a href="<package-oldosx-stable-sig>">sig</a>).
46
-Be sure to read the <a href="<cvssandbox>tor/doc/tor-doc-osx.html">OS X Tor instructions</a>.
47
-</li>
48
-<li><b>Debian packages</b>: <kbd>apt-get install tor</kbd> (<a href="http://wiki.noreply.org/noreply/TheOnionRouter/TorOnDebian">guide for Sarge and experimental Tor versions</a>)
49
-</li>
50
-
51
-<li><b>Red Hat Linux</b> package:
52
-<a href="<package-rpm-stable>"><version-rpm-stable> RPM</a> (<a href="<package-rpm-stable-sig>">sig</a>),
53
-<a href="<package-srpm-stable>"><version-rpm-stable> SRPM</a> (<a href="<package-srpm-stable-sig>">sig</a>),
54
-<a href="<package-rpm-alpha>"><version-rpm-alpha> RPM</a> (<a href="<package-rpm-alpha-sig>">sig</a>),
51
+<a href="<package-osx-alpha>"><version-osx-alpha></a> (<a href="<package-osx-alpha-sig>">sig</a>)
52
+</td>
53
+<td><a href="<cvssandbox>tor/doc/tor-doc-osx.html">OS X instructions</a></td>
54
+</tr>
55
+
56
+<tr>
57
+<td>Mac OS X Panther/Jaguar</td>
58
+<td>
59
+<a href="<package-oldosx-stable>"><version-oldosx-stable></a> (<a href="<package-oldosx-stable-sig>">sig</a>)
60
+</td>
61
+<td><a href="<cvssandbox>tor/doc/tor-doc-osx.html">OS X instructions</a></td>
62
+</tr>
63
+
64
+<tr>
65
+<td>Debian</td>
66
+<td><kbd>apt-get install tor</kbd></td>
67
+<td>
68
+<ul>
69
+<li><a href="<cvssandbox>tor/doc/tor-doc-unix.html">Linux/BSD/Unix instructions</a></li>
70
+<li><a href="http://wiki.noreply.org/noreply/TheOnionRouter/TorOnDebian">Backports to Woody and Sarge, Packages for Ubuntu, and packages of experimental Tor versions</a></li>
71
+</ul>
72
+</td>
73
+</tr>
74
+
75
+<tr>
76
+<td>Gentoo</td>
77
+<td><kbd>emerge tor</kbd></td>
78
+<td>
79
+<ul>
80
+<li><a href="<cvssandbox>tor/doc/tor-doc-unix.html">Linux/BSD/Unix instructions</a></li>
81
+<li><a href="http://gentoo-wiki.com/HOWTO_Anonymity_with_Tor_and_Privoxy">Gentoo-wiki guide</a></li>
82
+</ul>
83
+</td>
84
+</tr>
85
+
86
+<tr>
87
+<td>Red Hat Linux</td>
88
+<td>
89
+<a href="<package-rpm-stable>"><version-rpm-stable> RPM</a> (<a href="<package-rpm-stable-sig>">sig</a>)
90
+<br>
91
+<a href="<package-srpm-stable>"><version-rpm-stable> SRPM</a> (<a href="<package-srpm-stable-sig>">sig</a>)
92
+<br>
93
+<a href="<package-rpm-alpha>"><version-rpm-alpha> RPM</a> (<a href="<package-rpm-alpha-sig>">sig</a>)
94
+<br>
55 95
 <a href="<package-srpm-alpha>"><version-rpm-alpha> SRPM</a> (<a href="<package-srpm-alpha-sig>">sig</a>)
56
-</li>
57
-
58
-<li><b>Gentoo</b>: <kbd>emerge tor</kbd> (<a href="http://gentoo-wiki.com/HOWTO_Anonymity_with_Tor_and_Privoxy">guide</a>)</li>
59
-<li><b>FreeBSD</b>: <kbd>portinstall -s security/tor</kbd></li>
60
-<li><b>OpenBSD</b>: <kbd>cd /usr/ports/net/tor &amp;&amp; make &amp;&amp; make install</kbd> (<a href="http://wiki.noreply.org/noreply/TheOnionRouter/OpenbsdChrootedTor">guide to chrooting</a>)</li>
61
-<li><b>NetBSD</b>: <kbd>cd /usr/pkgsrc/net/tor &amp;&amp; make install</kbd></li>
62
-<li>Latest source tarballs: <a href="<package-source-stable>"><version-stable></a> (<a href="<package-source-stable-sig>">sig</a>),
63
-<a href="<package-source-alpha>"><version-alpha></a> (<a href="<package-source-alpha-sig>">sig</a>) </li>
96
+</td>
97
+<td><a href="<cvssandbox>tor/doc/tor-doc-unix.html">Linux/BSD/Unix instructions</a></td>
98
+</tr>
99
+
100
+<tr>
101
+<td>FreeBSD</td>
102
+<td><kbd>portinstall -s security/tor</kbd></td>
103
+<td><a href="<cvssandbox>tor/doc/tor-doc-unix.html">Linux/BSD/Unix instructions</a></td>
104
+</tr>
105
+
106
+<tr>
107
+<td>OpenBSD</td>
108
+<td><kbd>cd /usr/ports/net/tor &amp;&amp; make &amp;&amp; make install</kbd></td>
109
+<td>
110
+<ul>
111
+<li><a href="<cvssandbox>tor/doc/tor-doc-unix.html">Linux/BSD/Unix instructions</a></li>
112
+<li><a href="http://wiki.noreply.org/noreply/TheOnionRouter/OpenbsdChrootedTor">Guide to chrooting Tor in OpenBSD</a></li>
64 113
 </ul>
114
+</td>
115
+</tr>
116
+
117
+<tr>
118
+<td>NetBSD</td>
119
+<td><kbd>cd /usr/pkgsrc/net/tor &amp;&amp; make install</kbd></td>
120
+<td><a href="<cvssandbox>tor/doc/tor-doc-unix.html">Linux/BSD/Unix instructions</a></td>
121
+</tr>
122
+
123
+<tr>
124
+<td>Source tarballs</td>
125
+<td>
126
+<a href="<package-source-stable>"><version-stable></a> (<a href="<package-source-stable-sig>">sig</a>),
127
+<a href="<package-source-alpha>"><version-alpha></a> (<a href="<package-source-alpha-sig>">sig</a>)
128
+</td>
129
+<td>n/a</td>
130
+</tr>
131
+
132
+</table>
65 133
 
66
-<p>Instructions for setting up Tor on Linux/BSD/Unix are <a
67
-href="<cvssandbox>tor/doc/tor-doc-unix.html">here</a>. This <a
68
-href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#DistSignatures">FAQ
69
-entry</a> explains how to verify package signatures.
70
-</p>
134
+<hr />
71 135
 
72
-<p>See the <a href="<page developers>">developers page</a> for instructions
73
-on fetching Tor from CVS.
74
-</p>
136
+<h2>More Information</h2>
137
+
138
+<ul>
139
+<li>See the <a href="<page documentation>">">docs page</a> for instructions on setting up Tor for your platform.</li>
140
+<li>See this <a href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#DistSignatures">FAQ entry</a> for instructions on verifying package signatures, which allows you to make sure you've downloaded the file you wanted.</li>
141
+<li>See the <a href="<page developers>">developers page</a> for instructions on fetching Tor from CVS to get the latest development version. Note that this version may not work or even compile!
142
+</ul>
75 143
 
76 144
 <p>For a list of sites mirroring Tor see <a href="<page mirrors>">this page</a>.
77 145
 </p>
78 146