in response to ticket 2143, completely rework the download page to be less confusing, add more descriptions per operating system, and try to more clearly lay out which package contains what software.
Andrew Lewman

Andrew Lewman commited on 2010-11-04 20:44:33
Zeige 1 geänderte Dateien mit 99 Einfügungen und 141 Löschungen.

... ...
@@ -14,145 +14,140 @@
14 14
 </p>
15 15
 </div>
16 16
 <!-- END TEASER WARNING -->
17
+<!-- START WINDOWS -->
17 18
 <table class="topforty">
18 19
 <tr>
19
-          	<td class="nopad" colspan="4"><div class="title"><a name="torbrowser">Tor Browser Bundle</a></div></td>
20
+<td class="nopad"><div class="title"><a name="Windows">Microsoft Windows</a></div></td>
20 21
 </tr>
21 22
 <tr>
22
-		      <td class="intro" colspan="4">The Tor Browser Bundle
23
-contains everything you need to safely browse the Internet. This package
24
-requires no installation. Just extract it and run. <a href="<page
25
-projects/torbrowser>">Learn more &raquo;</a></td>
26
-          </tr>
27
-          <tr>
28
-          	<td><span class="column-title">Language</span></td>
29
-            <td><span class="column-title">Version</span></td>
30
-            <td><span class="column-title">Platform</span></td>
31
-            <td><span class="column-title">Tor Browser Source Code</span></td>
23
+<td>The Tor Software comes bundled in three different ways:  
24
+<ul>
25
+<li>The <strong>Tor Browser Bundle</strong> contains everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></li>
26
+<li>The <strong>Vidalia Bundle</strong> contains Tor, <a href="<page projects/vidalia>">Vidalia</a>, and Polipo for installation on your system.  You need to configure your applications to use Tor.</li>
27
+<li>The <strong>Expert Package</strong> contains just Tor and nothing else.  You'll need to configure Tor and all of your applications manually.</li>
28
+</ul>
29
+<p>There are two versions of each package, a stable and alpha release.  Stable packages are released when we believe the features and code will not change for many months.  Alpha or unstable packages are released so you can help us test new features and bugfixes. Even though they have a higher version number than the stable versions listed above, there is a much higher chance of serious reliability and security bugs in these downloads.  Please be prepared to <a href="https://bugs.torproject.org/">report bugs</a>.</p>
30
+<p>The current stable version of Tor for Windows is <version-win32-stable>.  The current alpha/unstable version of tor for Windows is <version-win32-alpha>.</p>
31
+</td>
32 32
 </tr>
33 33
 <tr class="beige">
34
-          	<td>English (en-US)</td>
35
-            <td><version-torbrowserbundle></td>
36 34
 <td><span class="windows">
37
-              <a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe">Download</a>&nbsp;
38
-              (<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe.asc">sig</a>)
35
+Tor Browser Bundle version <version-torbrowserbundle>, <a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe">Download</a>&nbsp;(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe.asc">sig</a>)
39 36
 </span>
40 37
 </td>
38
+</tr>
39
+<tr>
41 40
 <td><span class="windows">
42
-              <a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>-src.tar.gz">Download Tarball</a>&nbsp;
43
-              (<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>-src.tar.gz.asc">sig</a>)
41
+Tor Browser Instant Messaging Bundle version <version-torimbrowserbundle>, <a href="../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_en-US.exe">Download</a>&nbsp;(<a href="../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_en-US.exe.asc">sig</a>)
44 42
 </span>
45 43
  </td>
46
-          </tr>
47
-          <tr>
48
-            <td>English (en-US)</td>
49
-            <td><version-torbrowserbundlelinux></td>
50
-            <td><span class="linux">
51
-              <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a>&nbsp;
52
-              (<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz.asc">sig</a>)
44
+ <tr class="beige">
45
+ <td><span class="windows">
46
+Tor Browser Bundle version <version-torbrowserbundle> source code,<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>-src.tar.gz">Download Tarball</a>&nbsp;(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>-src.tar.gz.asc">sig</a>)
53 47
 </span>
54 48
 </td>
55
-            <td></td>
56 49
 </tr>
50
+ <tr><td><span class="windows">
51
+ Stable Vidalia Bundle for Windows works with Windows 7, Vista, XP, 2003 Server, <a href="<package-win32-bundle-stable>">Download Stable</a>/(<a href="<package-win32-bundle-stable>.asc">sig</a>)
52
+ </span></td>
53
+ </tr>
54
+ <tr class="beige"><td><span class="windows">Unstable Vidalia Bundles for Windows works with Windows 7, Vista, XP, 2003 Server, <a href="<package-win32-bundle-alpha>">Download Unstable</a>/(<a href="<package-win32-bundle-alpha>.asc">sig</a>)</span></td>
55
+ </tr>
56
+ <tr>
57
+ <td><span class="windows">Stable Expert Bundle for Windows works with Windows 98SE, ME, Windows 7, Vista, XP, 2000, 2003 Server, <a href="../dist/win32/tor-<version-win32-stable>-win32.exe">Download Stable</a> (<a href="../dist/win32/tor-<version-win32-stable>-win32.exe.asc">sig</a>)</td>
57 58
  <tr class="beige">
58
-            <td>English (en-US)</td>
59
-            <td><version-torbrowserbundleosx></td>
60
-            <td><span class="mac">
61
-              <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">Download</a>
62
-              (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc">sig</a>)
63
-              </span>
59
+ <td><span class="windows">Unstable Expert Bundle for Windows works with Windows 98SE, ME, Windows 7, Vista, XP, 2000, 2003 Server,
60
+<a href="../dist/win32/tor-<version-win32-alpha>-win32.exe">Download Unstable</a> (<a href="../dist/win32/tor-<version-win32-alpha>-win32.exe.asc">sig</a>)
61
+ </span></td>
62
+ </tr>
63
+ <tr>
64
+<td>
65
+<a href="<page docs/tor-doc-windows>">Documentation for Microsoft Windows clients</a>
64 66
 </td>
65
-            <td></td>
66 67
 </tr>
67 68
 </table>
69
+<!-- END WINDOWS -->
70
+<!-- START OS X -->
68 71
 <table class="topforty">
69 72
 <tr>
70
-          	<td class="nopad" colspan="5"><div class="title"><a name="torimbrowser">Tor Instant Messager Browser Bundles</a></div></td>
73
+<td class="nopad"><div class="title"><a name="mac">Apple OS X</a></div></td>
71 74
 </tr>
72 75
 <tr>
73
-		      <td class="intro" colspan="4">The Tor Browser Bundle
74
-contains everything you need to safely browse the Internet. This package
75
-requires no installation. Just extract it and run. <a href="<page
76
-projects/torbrowser>">Learn more &raquo;</a></td>
77
-          </tr>
78
-              <tr>
79
-                <td><span class="column-title">Language</span></td>
80
-                <td><span class="column-title">Version</span></td>
81
-                <td><span class="column-title">Platform</span></td>
82
-                <td><span class="column-title">Tor IM Browser Source Code</span></td>
76
+<td class="intro">The Tor Software comes bundled in three different ways:  
77
+<ul>
78
+<li>The <strong>Tor Browser Bundle</strong> contains everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></li>
79
+<li>The <strong>Vidalia Bundle</strong> contains Tor, <a href="<page projects/vidalia>">Vidalia</a>, and Polipo for installation on your system.  You need to configure your applications to use Tor.</li>
80
+<li>The <strong>Expert Package</strong> contains just Tor and nothing else.  You'll need to configure Tor and all of your applications manually.</li>
81
+</ul>
82
+<p>There are two versions of each package, a stable and alpha release.  Stable packages are released when we believe the features and code will not change for many months.  Alpha or unstable packages are released so you can help us test new features and bugfixes. Even though they have a higher version number than the stable versions listed above, there is a much higher chance of serious reliability and security bugs in these downloads.  Please be prepared to <a href="https://bugs.torproject.org/">report bugs</a>.</p>
83
+<p>The current stable version of Tor for OS X is <version-osx-x86-stable>.  The current alpha/unstable version of Tor for OS X is <version-osx-x86-alpha>.</p>
84
+</td>
83 85
 </tr>
84 86
 <tr class="beige">
85
-                <td>English (en-US)</td>
86
-                <td><version-torimbrowserbundle></td>
87
-                <td><span class="windows">
88
-                  <a href="../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_en-US.exe">Download</a>&nbsp;
89
-                  (<a href="../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_en-US.exe.asc">sig</a>)
90
-                  </span>
91
-                </td>
92
-                <td><span class="windows">
93
-                  <a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>-src.tar.gz">Download Tarball</a>
94
-                  (<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>-src.tar.gz">sig</a>)
87
+<td><span class="mac">Tor Browser Bundle for OS X Intel (beta version), 
88
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">Download</a>
89
+(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc">sig</a>)
95 90
 </span>
96 91
 </td>
97
-                <td></td>
98 92
 </tr>
99
-  		</table>
100
-        <table class="topforty">
101 93
 <tr>
102
-          	<td class="nopad" colspan="5"><div class="title"><a name="tor">Vidalia Bundles</a></div></td>
94
+<td><span class="mac">Stable Vidalia Bundle for OS X Intel, <a href="<package-osx-x86-bundle-stable>">Download Stable</a>/(<a href="<package-osx-x86-bundle-stable>.asc">sig</a>)</span></td></tr>
95
+<tr class="beige">
96
+<td><span class="mac">Unstable Vidalia Bundle for OS X Intel, <a href="<package-osx-x86-bundle-alpha>">Download Unstable</a>/(<a href="<package-osx-x86-bundle-alpha>.asc">sig</a>)</span></td>
103 97
 </tr>
104 98
 <tr>
105
-		      <td class="intro" colspan="4">The Vidalia Bundle contains Tor, Vidalia, and Polipo for installation on your system.  You'll need to configure your applications to use it.</td>
99
+<td><span class="mac">Stable Vidalia for OS X PowerPC, <a href="<package-osx-ppc-bundle-stable>">Download Stable</a>/(<a href="<package-osx-ppc-bundle-stable>.asc">sig</a>)</td></tr>
100
+ <tr class="beige">
101
+<td><span class="mac">Unstable Vidalia for OS X PowerPC, <a href="<package-osx-ppc-bundle-alpha>">Download Unstable</a>/(<a href="<package-osx-ppc-bundle-alpha>.asc">sig</a>)</span></td>
106 102
 </tr>
107 103
  <tr>
108
-            <td><span class="column-title">Operating System</span></td>
109
-            <td><span class="column-title">Notes</span></td>
110
-            <td><span class="column-title">Stable</span></td>
111
-            <td><span class="column-title">Alpha</span></td>
112
-            <td><span class="column-title">Installation Guide</span></td>
104
+<td><span class="mac">Stable Expert Package for OS X Intel, <a href="../dist/osx-x86/Tor-<version-osx-x86-stable>-i386-Bundle.dmg">Download Stable</a> (<a href="../dist/osx-x86/Tor-<version-osx-x86-stable>-i386-Bundle.dmg.asc">sig</a>)</span></td>
113 105
 </tr>
114 106
 <tr class="beige">
115
-	    <td><span class="windows">Windows</span></td>
116
-        <td>Windows 7, Vista, XP, 2003 Server</td>
117
-        <td><a href="<package-win32-bundle-stable>"><version-win32-stable></a>/(<a href="<package-win32-bundle-stable>.asc">sig</a>)</td>
118
-        <td><a href="<package-win32-bundle-alpha>"><version-win32-alpha></a>/(<a href="<package-win32-bundle-alpha>.asc">sig</a>)</td>
119
-        <td><a href="<page docs/tor-doc-windows>">Windows</a></td>
120
-      </tr>
121
-      <tr>
122
-        <td><span class="mac">Mac (x86)</span></td>
123
-        <td>Intel only</td>
124
-        <td><a href="<package-osx-x86-bundle-stable>"><version-osx-x86-stable></a>/(<a href="<package-osx-x86-bundle-stable>.asc">sig</a>)</td>
125
-        <td><a href="<package-osx-x86-bundle-alpha>"><version-osx-x86-alpha></a>/(<a href="<package-osx-x86-bundle-alpha>.asc">sig</a>)</td>
126
-        <td><a href="<page docs/tor-doc-osx>">Mac (Intel)</a></td>
107
+<td><span class="mac">Unstable Expert Package for OS X Intel, <a href="../dist/osx-x86/Tor-<version-osx-x86-alpha>-i386-Bundle.dmg">Download Unstable</a> (<a href="../dist/osx-x86/Tor-<version-osx-x86-alpha>-i386-Bundle.dmg.asc">sig</a>)</span></td>
127 108
 </tr>
128 109
 <tr class="beige">
129
-        <td><span class="mac">Mac (PPC)</span></td>
130
-        <td>PowerPC only</td>
131
-        <td><a href="<package-osx-ppc-bundle-stable>"><version-osx-ppc-stable></a>/(<a href="<package-osx-ppc-bundle-stable>.asc">sig</a>)</td>
132
-        <td><a href="<package-osx-ppc-bundle-alpha>"><version-osx-ppc-alpha></a>/(<a href="<package-osx-ppc-bundle-alpha>.asc">sig</a>)</td>
133
-        <td><a href="<page docs/tor-doc-osx>">Mac (Power PC)</a></td>
110
+<td><span class="mac">Stable Expert Package for OS X PowerPC, <a href="../dist/osx-ppc/Tor-<version-osx-ppc-stable>-ppc-Bundle.dmg">Download Stable</a> (<a href="../dist/osx-ppc/Tor-<version-osx-ppc-stable>-ppc-Bundle.dmg.asc">sig</a>)</span></td>
134 111
 </tr>
135 112
 <tr>
136
-        <td><span class="linux">Linux/Unix</span></td>
137
-        <td>Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE</td>
138
-        <td colspan="2">Read how to use <a href="<page download/download-unix>">our repositories</a>.</td>
139
-        <td><a href="<page download/download-unix>">Linux/Unix</a></td>
113
+<td><span class="mac">Unstable Expert Package for OS X PowerPC, <a href="../dist/osx-ppc/Tor-<version-osx-ppc-alpha>-ppc-Bundle.dmg">Download Unstable</a> (<a href="../dist/osx-ppc/Tor-<version-osx-ppc-alpha>-ppc-Bundle.dmg.asc">sig</a>)</span></td>
114
+</tr>
115
+<tr class="beige">
116
+<td><a href="<page docs/tor-doc-osx>">Documentation for Apple OS X clients</a>.</td>
140 117
 </tr>
141 118
 </table>
119
+ <!-- END OS X -->
120
+ <!-- START UNIX -->
142 121
  <table class="topforty">
143 122
 <tr>
144
-          	<td class="nopad" colspan="4"><div class="title"><a name="smartphones">Tor for Smartphones</a></div></td>
123
+<td class="nopad"><div class="title"><a name="linux">Linux/Unix</a></div></td></tr>
124
+<tr>
125
+<td class="intro">The Tor Software comes bundled in two different ways:  
126
+<ul>
127
+<li>The <strong>Tor Browser Bundle</strong> contains everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></li>
128
+<li>Read how to use <a href="<page download/download-unix>">our repositories for the Tor software.</a>.</li>
129
+</ul>
130
+</td>
131
+</tr>
132
+<tr class="beige">
133
+<td><span class="linux">Tor Browser Bundle for GNU/Linux on i686, 
134
+<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a>&nbsp;
135
+(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz.asc">sig</a>)
136
+</span>
137
+</td>
138
+</tr>
139
+<tr>
140
+<td><span class="linux">Use <a href="<page download/download-unix>">our repositories</a> for all other Tor-related software.</span></td>
145 141
 </tr>
142
+</table>
143
+<table class="topforty">
146 144
 <tr>
147
-              <td><span class="column-title">Device</span></td>
148
-              <td><span class="column-title">Version</span></td>
149
-              <td><span class="column-title">Download</span></td>
150
-              <td><span class="column-title">Installation Guide</span></td>
145
+<td class="nopad"><div class="title"><a name="smartphones">Tor for Smartphones</a></div></td>
151 146
 </tr>
152 147
 <tr class="beige">
153 148
 <td colspan="2">Android-based phones, tablets, computers</td>
154
-              <td><a href="../dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk"><version-androidbundle-tor></a></td>
155
-              <td><a href="<page docs/android>">Instructions</a></td>
149
+<td><a href="../dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk">Android Bundle</a></td>
150
+<td><a href="<page docs/android>">Android Instructions</a></td>
156 151
 </tr>
157 152
 <tr>
158 153
 <td colspan="2">iPhone, iPod Touch, iPad</td>
... ...
@@ -165,58 +160,22 @@ projects/torbrowser>">Learn more &raquo;</a></td>
165 160
 <td></td>
166 161
 </tr>
167 162
 </table>
163
+<!-- END UNIX -->
164
+<!-- BEGIN SOURCE -->
168 165
 <table class="topforty">
169 166
 <tr>
170
-          	<td class="nopad" colspan="4"><div class="title"><a name="expert">Expert Packages</a></div></td>
171
-          </tr>
172
-          <tr>
173
-		      <td class="intro" colspan="4">The Expert Packages
174
-		      contain just Tor and nothing else.  You'll need
175
-		      to configure Tor and all of your applications
176
-		      manually.</td>
177
-          </tr>
178
-          		<tr>
179
-                <td><span class="column-title">Operating System</span></td>
180
-                <td><span class="column-title">Notes</span></td>
181
-                <td><span class="column-title">Stable</span></td>
182
-                <td><span class="column-title">Alpha</span></td>
183
-                <td><span class="column-title">Installation Guide</span></td>
184
-              </tr>
185
-              <tr class="beige">
186
-                <td><span class="windows">Windows</span></td>
187
-                <td>Windows 7, Vista, XP, 2000, 2003 Server</td>
188
-                <td><a href="../dist/win32/tor-<version-win32-stable>-win32.exe"><version-win32-stable></a> (<a href="../dist/win32/tor-<version-win32-stable>-win32.exe.asc">sig</a>)</td>
189
-                <td><a href="../dist/win32/tor-<version-win32-alpha>-win32.exe"><version-win32-alpha></a> (<a href="../dist/win32/tor-<version-win32-alpha>-win32.exe.asc">sig</a>)</td>
190
-                <td><a href="<page docs/tor-doc-windows>">Windows</a></td>
191
-              </tr>
192
-              <tr>
193
-                <td><span class="mac">Mac (x86)</span></td>
194
-                <td>Intel only</td>
195
-                <td><a href="../dist/osx-x86/Tor-<version-osx-x86-stable>-i386-Bundle.dmg"><version-osx-x86-stable></a> (<a href="../dist/osx-x86/Tor-<version-osx-x86-stable>-i386-Bundle.dmg.asc">sig</a>)</td>
196
-                <td><a href="../dist/osx-x86/Tor-<version-osx-x86-alpha>-i386-Bundle.dmg"><version-osx-x86-alpha></a> (<a href="../dist/osx-x86/Tor-<version-osx-x86-alpha>-i386-Bundle.dmg.asc">sig</a>)</td>
197
-                <td><a href="<page docs/tor-doc-osx>">Mac (Intel)</a></td>
198
-              </tr>
199
-              <tr class="beige">
200
-                <td><span class="mac">Mac (PPC)</span></td>
201
-                <td>PowerPC only</td>
202
-                <td><a href="../dist/osx-ppc/Tor-<version-osx-ppc-stable>-ppc-Bundle.dmg"><version-osx-ppc-stable></a> (<a href="../dist/osx-ppc/Tor-<version-osx-ppc-stable>-ppc-Bundle.dmg.asc">sig</a>)</td>
203
-                <td><a href="../dist/osx-ppc/Tor-<version-osx-ppc-alpha>-ppc-Bundle.dmg"><version-osx-ppc-alpha></a> (<a href="../dist/osx-ppc/Tor-<version-osx-ppc-alpha>-ppc-Bundle.dmg.asc">sig</a>)</td>
204
-                <td><a href="<page docs/tor-doc-osx>">Mac (Power PC)</a></td>
205
-              </tr>
206
-              <tr>
207
-                <td><span class="linux">Linux/Unix</span></td>
208
-                <td>Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE</td>
209
-                <td colspan="2">Read how to use <a href="<page download/download-unix>">our repositories</a>.</td>
210
-                <td><a href="<page download/download-unix>">Linux/Unix</a></td>
167
+<td class="nopad"><div class="title"><a name="source">Source Code</a></div></td>
211 168
 </tr>
212 169
 <tr class="beige">
213 170
 <td>Source Tarballs</td>
214 171
 <td>./configure && make && src/or/tor</td>
215
-                <td><a href="../dist/tor-<version-stable>.tar.gz"><version-stable></a> (<a href="../dist/tor-<version-stable>.tar.gz.asc">sig</a>)</td>
216
-                <td><a href="../dist/tor-<version-alpha>.tar.gz"><version-alpha></a> (<a href="../dist/tor-<version-alpha>.tar.gz.asc">sig</a>)</td>
217
-                <td></td>
172
+<td><a href="../dist/tor-<version-stable>.tar.gz">Download Stable</a> (<a href="../dist/tor-<version-stable>.tar.gz.asc">sig</a>)</td>
173
+<td><a href="../dist/tor-<version-alpha>.tar.gz">Download Unstable</a> (<a href="../dist/tor-<version-alpha>.tar.gz.asc">sig</a>)</td>
218 174
 </tr>
219 175
 </table>
176
+<!-- END SOURCE -->
177
+
178
+<br>
220 179
 
221 180
 <!-- BEGIN WARNING -->
222 181
 <div class="warning">
... ...
@@ -303,12 +262,11 @@ all the issues</a>.
303 262
 <div class="sidenav-sub">
304 263
 <h2>Jump to:</h2>
305 264
 <ul>
306
-            	<li class="dropdown"><a href="#torbrowser">Tor Browser Bundles</a></li>
307
-            	<li class="dropdown"><a href="#torimbrowser">Tor Browser with Instant Messenger Client</a></li>
308
-            	<li class="dropdown"><a href="#tor">Vidalia Bundles</a></li>
309
-            	<li class="dropdown"><a href="#smartphones">Tor for Smartphones</a></li>
310
-            	<li class="dropdown"><a href="#expert">Expert Packages
311
-&amp; Tor Source Code</a></li>
265
+<li class="dropdown"><a href="#Windows">Microsoft Windows</a></li>
266
+<li class="dropdown"><a href="#mac">Apple OS X</a></li>
267
+<li class="dropdown"><a href="#linux">Linux/Unix</a></li>
268
+<li class="dropdown"><a href="#smartphones">Smartphones</a></li>
269
+<li class="dropdown"><a href="#source">Source Code</a></li>
312 270
 </ul>
313 271
 </div>
314 272
 </div>
315 273