Browse code

Make it more obvious that there is a bundle download and a just-Tor download for those windows folks. Can we get edmanm to sign his stuff?

Peter Palfrader authored on18/01/2006 18:58:58
Showing4 changed files
... ...
@@ -44,18 +44,23 @@ eintr
44 44
 </thead>
45 45
 
46 46
 <tr>
47
-<td>Windows</td>
48
-<td><version-win32-stable>
49
-<a href="<package-win32-stable>">Tor selbst</a> (<a
50
-href="<package-win32-stable-sig>">sig</a>) oder <a
51
-href="http://www.freehaven.net/~edmanm/torcp/download/tor-0.1.0.16-torcp-0.0.4-bundle.exe">gepackt mit TorCP</a>,
52
-<version-win32-alpha>
53
-<a href="<package-win32-alpha>">Tor selbst</a> (<a
54
-href="<package-win32-alpha-sig>">sig</a>) oder <a
55
-href="http://www.freehaven.net/~edmanm/torcp/download/tor-0.1.1.12-torcp-0.0.4-bundle.exe">gepackt mit TorCP</a>.
47
+<td>Windows: Tor &amp; Privoxy &amp; TorCP Paket</td>
48
+<td>
49
+<a href="<package-win32-bundle-stable>"><version-win32-bundle-stable></a>,
50
+<a href="<package-win32-bundle-alpha>"><version-win32-bundle-alpha></a>.
51
+</td>
56 52
 <td><a href="<cvssandbox>tor/doc/tor-doc-win32.html">Installationsanweisungen f&uuml;r Tor unter Windows</a></td>
57 53
 </tr>
58 54
 
55
+<tr>
56
+<td>Windows: nur Tor (Installer)</td>
57
+<td>
58
+<a href="<package-win32-stable>"><version-win32-stable></a> (<a href="<package-win32-alpha-sig>">sig</a>),
59
+<a href="<package-win32-alpha>"><version-win32-alpha></a> (<a href="<package-win32-alpha-sig>">sig</a>).
60
+</td>
61
+<td>&Auml;hnlich wie <a href="<cvssandbox>tor/doc/tor-doc-unix.html#privoxy">unter UNIX</a></td>
62
+</tr>
63
+
59 64
 <tr>
60 65
 <td>Mac OS X Tiger</td>
61 66
 <td><a href="<package-osx-stable>"><version-osx-stable></a> (<a href="<package-osx-stable-sig>">sig</a>),
... ...
@@ -42,16 +42,23 @@ need to confirm via email):
42 42
 </thead>
43 43
 
44 44
 <tr>
45
-<td>Windows</td>
45
+<td>Windows: Tor &amp; Privoxy &amp; TorCP bundle</td>
46 46
 <td>
47
-<version-win32-stable>
48
-<a href="<package-win32-stable>">by itself</a> (<a href="<package-win32-stable-sig>">sig</a>) or <a href="http://www.freehaven.net/~edmanm/torcp/download/tor-0.1.0.16-torcp-0.0.4-bundle.exe">bundled</a>,
49
-<version-win32-alpha>
50
-<a href="<package-win32-alpha>">by itself</a> (<a href="<package-win32-alpha-sig>">sig</a>) or <a href="http://www.freehaven.net/~edmanm/torcp/download/tor-0.1.1.12-torcp-0.0.4-bundle.exe">bundled</a>.
47
+<a href="<package-win32-bundle-stable>"><version-win32-bundle-stable></a>,
48
+<a href="<package-win32-bundle-alpha>"><version-win32-bundle-alpha></a>.
51 49
 </td>
52 50
 <td><a href="<cvssandbox>tor/doc/tor-doc-win32.html">Win32 instructions</a></td>
53 51
 </tr>
54 52
 
53
+<tr>
54
+<td>Windows: just Tor (installer)</td>
55
+<td>
56
+<a href="<package-win32-stable>"><version-win32-stable></a> (<a href="<package-win32-alpha-sig>">sig</a>),
57
+<a href="<package-win32-alpha>"><version-win32-alpha></a> (<a href="<package-win32-alpha-sig>">sig</a>).
58
+</td>
59
+<td>similar to the <a href="<cvssandbox>tor/doc/tor-doc-unix.html#privoxy">Unix instructions</a></td>
60
+</tr>
61
+
55 62
 <tr>
56 63
 <td>Mac OS X Tiger</td>
57 64
 <td>
... ...
@@ -7,6 +7,9 @@
7 7
 <define-tag version-win32-stable      whitespace=delete>0.1.0.16</define-tag>
8 8
 <define-tag version-win32-alpha       whitespace=delete>0.1.1.12-alpha</define-tag>
9 9
 
10
+<define-tag version-win32-bundle-stable whitespace=delete>0.1.0.16</define-tag>
11
+<define-tag version-win32-bundle-alpha  whitespace=delete>0.1.1.12-alpha</define-tag>
12
+
10 13
 <define-tag version-osx-stable        whitespace=delete>0.1.0.16</define-tag>
11 14
 <define-tag version-osx-alpha         whitespace=delete>0.1.1.12-alpha</define-tag>
12 15
 
... ...
@@ -30,6 +33,9 @@
30 33
 <define-tag package-win32-stable      whitespace=delete>dist/win32/tor-<version-win32-stable>-win32.exe</define-tag>
31 34
 <define-tag package-win32-alpha       whitespace=delete>dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag>
32 35
 
36
+<define-tag package-win32-bundle-stable whitespace=delete>http://www.freehaven.net/~edmanm/torcp/download/tor-<version-win32-bundle-stable>-torcp-0.0.4-bundle.exe</define-tag>
37
+<define-tag package-win32-bundle-alpha  whitespace=delete>http://www.freehaven.net/~edmanm/torcp/download/tor-<version-win32-bundle-alpha>-torcp-0.0.4-bundle.exe</define-tag>
38
+
33 39
 <define-tag package-osx-stable        whitespace=delete>dist/osx/Tor <version-osx-stable> Bundle.dmg</define-tag>
34 40
 <define-tag package-osx-alpha         whitespace=delete>dist/osx/Tor <version-osx-alpha> Bundle.dmg</define-tag>
35 41
 
... ...
@@ -16,10 +16,17 @@ qui</a>. L'ultima release stablie &egrave; la <b><version-stable></b>, e quella
16 16
 sviluppo &egrave; la <b><version-alpha></b>.
17 17
 Tor gira su Linux, BSD, OS X, Windows, Solaris, e altri ancora.</p>
18 18
 <ul>
19
-<li><b>Windows</b> installer:
19
+
20
+
21
+<li><b>Windows</b> installer (Tor+Privoxy+TorCP):
22
+<a href="<package-win32-bundle-stable>"><version-win32-bundle-stable></a>,
23
+<a href="<package-win32-bundle-alpha>"><version-win32-bundle-alpha></a>.
24
+Si raccomanda la lettura delle <a href="<cvssandbox>tor/doc/tor-doc-win32.html">istruzioni per Win32</a>.</li>
25
+
26
+<li><b>Windows</b> installer (solo Tor):
20 27
 <a href="<package-win32-stable>"><version-win32-stable></a> (<a href="<package-win32-stable-sig>">sig</a>),
21 28
 <a href="<package-win32-alpha>"><version-win32-alpha></a> (<a href="<package-win32-alpha-sig>">sig</a>).
22
-Si raccomanda la lettura delle <a href="<cvssandbox>tor/doc/tor-doc-win32.html">istruzioni per Win32</a>.</li>
29
+simile con <a href="<cvssandbox>tor/doc/tor-doc-unix.html#privoxy">istruzioni per UNIX</a>.</li>
23 30
 
24 31
 <li><b>Mac OS X Tiger</b> installer:
25 32
 <a href="<package-osx-stable>"><version-osx-stable></a> (<a href="<package-osx-stable-sig>">sig</a>),