copy all of the images over from trunk, update versions, update the docs sidenav to name the manual pages correctly, clean up download.wml so it actually works correctly.
Andrew Lewman

Andrew Lewman commited on 2010-10-05 23:12:37
Zeige 86 geänderte Dateien mit 69 Einfügungen und 74 Löschungen.

... ...
@@ -50,17 +50,17 @@
50 50
            'txt'  => 'Configuring a Mirror',
51 51
           },
52 52
           {'url'  => 'docs/tor-manual',
53
-           'txt'  => 'Tor Manual',
53
+           'txt'  => 'Tor -stable Manual',
54 54
           },
55 55
           {'url'  => 'docs/tor-manual-dev',
56
-           'txt'  => 'Tor Developer Manual',
56
+           'txt'  => 'Tor -alpha Manual',
57 57
           }],
58 58
       },
59 59
       {'url' => 'docs/glossary',
60 60
        'txt' => 'Glossary',
61 61
       },
62 62
       {
63
-       'url'  => 'http://wiki.torproject.org',
63
+       'url'  => '<wiki>',
64 64
        'txt'  => 'Tor Wiki',
65 65
       }, 
66 66
       {'url'  => 'docs/faq',
... ...
@@ -19,10 +19,7 @@
19 19
           	<td class="nopad" colspan="4"><div class="title"><a name="wim">Tor Browser Bundle</a></div></td>
20 20
           </tr>
21 21
         	<tr>
22
-		      <td class="intro" colspan="4">The Tor Browser
23
-		      Bundle contains Tor, Vidalia, Torbutton, Polipo, and
24
-		      Firefox. This package requires no installation. Just
25
-		      extract it and run.</td>
22
+		      <td class="intro" colspan="4">The Tor Browser Bundle contains everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.</td>
26 23
           </tr>
27 24
           <tr>
28 25
           	<td><span class="column-title">Language</span></td>
... ...
@@ -39,7 +36,13 @@
39 36
           <tr>
40 37
             <td>English (en-US)</td>
41 38
             <td><version-torbrowserbundlelinux></td>
42
-            <td><span class="linux"><a href="torbrowser/dist/linux/tor-im-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a></td></span></td>
39
+            <td><span class="linux"><a href="torbrowser/dist/linux/tor-im-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a></span></td>
40
+            <td></td>
41
+          </tr>
42
+          <tr class="beige">
43
+            <td>English (en-US)</td>
44
+            <td><version-torbrowserbundleosx></td>
45
+            <td><span class="mac"><a href="torbrowser/dist/osx/tor-browser-<version-torbrowserbundleosx>dev-osx-i386-en-US.zip"></a></span></td>
43 46
             <td></td>
44 47
           </tr>
45 48
         </table>
... ...
@@ -60,12 +63,6 @@
60 63
                 <td><span class="windows"><a href="torbrowser/dist/tor-im-browser-<version-torbrowserbundle>_en-US.tar.gz">Download Tarball</a></span></td>
61 64
                 <td></td>
62 65
               </tr>
63
-              <tr>
64
-                <td>English (en-US)</td>
65
-                <td><version-torbrowserbundlelinux></td>
66
-                <td><span class="linux"><a href="torbrowser/dist/linux/tor-im-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a></td></span></td>
67
-                <td></td>
68
-              </tr>
69 66
             </tr>
70 67
   		</table>
71 68
         <table class="topforty">
... ...
@@ -74,21 +71,21 @@
74 71
           </tr>
75 72
             <tr>
76 73
               <td><span class="column-title">Version</span></td>
77
-              <td><span class="column-title">Platform</span></td>
74
+              <td colspan="3"><span class="column-title">Platform</span></td>
78 75
               <td><span class="column-title">Source Code</span></td>
79 76
             </tr>
80 77
             <tr class="beige">
81 78
               <td><version-stable></td>
82 79
               <td><span class="windows"><a href="<package-win32-bundle-stable>">Download</a></span></td>
83 80
               <td><span class="mac"><a href="<package-osx-bundle-stable>">Download</a></span>
84
-              <td><span class="linux"><a href="<page download/download-unix/>">Unix Packages</a></span></td>
81
+              <td><span class="linux"><a href="<page download/download-unix>">Unix Repositories</a></span></td>
85 82
               <td><a href="<package-source-stable>">Download Tarball</a></td>
86 83
           	</tr>
87 84
             <tr>
88 85
               <td><version-alpha></td>
89 86
               <td><span class="windows"><a href="<package-win32-bundle-alpha>">Download</a></span></td>
90 87
               <td><span class="mac"><a href="<package-osx-bundle-alpha>">Download</a></span>
91
-              <td><span class="linux"><a href="<page download/download-unix>">Unix Packages</a></span></td>
88
+              <td><span class="linux"><a href="<page download/download-unix>">Unix Repositories</a></span></td>
92 89
               <td><a href="<package-source-alpha>">Download Tarball</a></td>
93 90
           	</tr>
94 91
         </table>
... ...
@@ -103,16 +100,13 @@
103 100
               <td><span class="column-title">Installation Guide</span></td>
104 101
             </tr>
105 102
             <tr class="beige">
106
-              <td>Android</td>
107
-              <td></td>
108
-              <td><package-androidbundle-alpha></td>
103
+              <td colspan="2">Android-based phones, tablets, computers</td>
104
+              <td><a href="dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk"><version-androidbundle-tor></td>
109 105
               <td><a href="<page docs/android>">Instructions</a></td>
110 106
           	</tr>
111 107
             <tr>
112
-              <td>iPhone, iPod Touch, iPad</td>
113
-              <td></td>
114
-              <td><span class="mac"><a href="http://sid77.slackware.it/iphone/">Test packages by Marco</a></span></td>
115
-              <td></td>
108
+              <td colspan="2">iPhone, iPod Touch, iPad</td>
109
+              <td colspan="2"><span class="mac"><a href="http://sid77.slackware.it/iphone/">Test packages by Marco</a></span></td>
116 110
           	</tr>
117 111
           	<tr class="beige">
118 112
               <td>Nokia Maemo/N900</td>
... ...
@@ -135,37 +129,35 @@
135 129
               <tr class="beige">
136 130
                 <td><span class="windows">Windows</span></td>
137 131
                 <td>Windows 7, Vista, XP, 2000, 2003 Server</td>
138
-                <td><a href="#">1.3.4</a></td>
139
-                <td><a href="#">1.3.6</a></td>
140
-                <td><a href="#">Windows</a></td>
132
+                <td><a href="/dist/win32/tor-<version-win32-stable>-win32.exe"<version-win32-stable></a></td>
133
+                <td><a href="/dist/win32/tor-<version-win32-alpha>-win32.exe"><version-win32-alpha></a></td>
134
+                <td><a href="<page docs/tor-doc-windows>">Windows</a></td>
141 135
               </tr>
142 136
               <tr>
143 137
                 <td><span class="mac">Mac (Intel)</span></td>
144 138
                 <td>Intel only</td>
145
-                <td><a href="#">1.3.4</a></td>
146
-                <td><a href="#">1.3.6</a></td>
147
-                <td><a href="#">Mac (Intel)</a></td>
139
+                <td><a href="/dist/osx/Tor-<version-osx-stable>-i386-Bundle.dmg"><version-osx-stable></a></td>
140
+                <td><a href="/dist/osx/Tor-<version-osx-alpha>-i386-Bundle.dmg"></a><version-osx-alpha></td>
141
+                <td><a href="<page docs/tor-doc-osx>">Mac (Intel)</a></td>
148 142
               </tr>
149 143
               <tr class="beige">
150 144
                 <td><span class="mac">Mac (Power PC)</span></td>
151 145
                 <td>Intel only</td>
152
-                <td><a href="#">1.3.4</a></td>
153
-                <td><a href="#">1.3.6</a></td>
154
-                <td><a href="#">Mac (Power PC)</a></td>
146
+                <td><a href="/dist/osx-old/Tor-<version-oldosx-stable>-ppc-Bundle.dmg"><version-oldosx-stable></a></td>
147
+                <td><a href="dist/osx-old/Tor-<version-oldosx-alpha>-ppc-Bundle.dmg"><version-oldosx-alpha></a></td>
148
+                <td><a href="<page docs/tor-doc-osx>">Mac (Power PC)</a></td>
155 149
               </tr>
156 150
               <tr>
157 151
                 <td><span class="linux">Linux/Unix</span></td>
158 152
                 <td>Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE</td>
159
-                <td><a href="#">1.3.4</a></td>
160
-                <td><a href="#">1.3.6</a></td>
161
-                <td><a href="#">Linux/Unix</a></td>
153
+                <td colspan="2">Read how to use <a href="<page download/download-unix>">our repositories</a>.</td>
154
+                <td><a href="<page download/download-unix>">Linux/Unix</a></td>
162 155
               </tr>
163 156
               <tr class="beige">
164 157
                 <td>Source Tarballs</td>
165 158
                 <td>./configure && make && src/or/tor</td>
166
-                <td><a href="#">1.3.4</a></td>
167
-                <td>&nbsp;</td>
168
-                <td><a href="#">Source Tarballs</a></td>
159
+                <td><a href="/dist/tor-<version-stable>.tar.gz"><version-stable></a></td>
160
+                <td><a href="/dist/tor-<version-alpha>.tar.gz"><version-alpha></a></td>
169 161
               </tr>
170 162
         </table>
171 163
 
... ...
@@ -246,7 +238,7 @@ all the issues</a>.
246 238
           	<ul>
247 239
             	<li class="dropdown"><a href="#wim">TorBrowser with Instant Messenger Client</a></li>
248 240
             	<li class="dropdown"><a href="#tbb">TorBrowser Bundles</a></li>
249
-            	<li class="dropdown"><a href="#tor">Tor Bundles</a></li>
241
+            	<li class="dropdown"><a href="#tor">Vidalia Bundles</a></li>
250 242
             	<li class="dropdown"><a href="#smartphones">Tor for Smartphones</a></li>
251 243
             	<li class="dropdown"><a href="#expert">Expert Packages</a></li>
252 244
             </ul>
... ...
@@ -256,11 +248,9 @@ all the issues</a>.
256 248
         <div class="img-shadow">
257 249
           <div class="infoblock">
258 250
           	<h2>Verify Signatures</h2>
259
-            <p>Blurb about why you should verify the signatures before you download software off the internet.</p>
260
-						<p><a href="#">Tor Bundle for Windows</a><br />
261
-					    <a href="#">TorBrowser Bundle for Windows</a><br />
262
-				      <a href="#">Tor Bundle for Mac</a><br />
263
-			        <a href="#">Tor Bundle for Linux/Unix</a></p>
251
+            <p>Verify your downloads with our PGP signatures:</p>
252
+            <a href="<page docs/verifying-signatures>">Read how to
253
+verify the signatures</a>.
264 254
           </div>
265 255
         </div>
266 256
         <!-- END INFOBLOCK -->
... ...
@@ -278,12 +268,6 @@ all the issues</a>.
278 268
           </div>
279 269
       	</div>
280 270
         <!-- END SIDENAV -->
281
-        <div class="img-shadow">
282
-        	<div class="infoblock">
283
-          	<h2>Disclaimers</h2>
284
-            <p>Blurb about how Tor wants to do right by its users, and list of things user should be aware of, like how if they download the TorBrowser and then use Internet Explorer, that they are not being adequately protected. You can use this space to advocate for knowledge about online security to augment Tor.</p>
285
-          </div>
286
-        </div>
287 271
       </div>
288 272
       <!-- END SIDECOL -->
289 273
     </div>
... ...
@@ -1,47 +1,55 @@
1 1
 <define-tag version-stable whitespace=delete>0.2.1.26</define-tag>
2
-<define-tag version-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
2
+<define-tag version-alpha whitespace=delete>0.2.2.17-alpha</define-tag>
3 3
 
4 4
 <define-tag version-win32-stable whitespace=delete>0.2.1.26</define-tag>
5
-<define-tag version-win32-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
5
+<define-tag version-win32-alpha whitespace=delete>0.2.2.17-alpha</define-tag>
6 6
 
7 7
 <define-tag version-win32-bundle-stable whitespace=delete>0.2.1.26</define-tag>
8
-<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
8
+<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.17-alpha</define-tag>
9 9
 
10 10
 <define-tag version-osx-bundle-stable whitespace=delete>0.2.1.26</define-tag>
11
-<define-tag version-osx-bundle-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
11
+<define-tag version-osx-bundle-alpha whitespace=delete>0.2.2.16-alpha</define-tag>
12 12
 
13 13
 <define-tag version-oldosx-bundle-stable whitespace=delete>0.2.1.26</define-tag>
14
-<define-tag version-oldosx-bundle-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
14
+<define-tag version-oldosx-bundle-alpha whitespace=delete>0.2.2.15-alpha</define-tag>
15 15
 
16 16
 <define-tag version-osx-stable whitespace=delete>0.2.1.26</define-tag>
17
-<define-tag version-osx-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
17
+<define-tag version-osx-alpha whitespace=delete>0.2.2.16-alpha</define-tag>
18 18
 
19 19
 <define-tag version-oldosx-stable whitespace=delete>0.2.1.26</define-tag>
20
-<define-tag version-oldosx-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
20
+<define-tag version-oldosx-alpha whitespace=delete>0.2.2.15-alpha</define-tag>
21 21
 
22
-<define-tag version-torbrowserbundle whitespace=delete>1.3.9</define-tag>
22
+<define-tag version-torbrowserbundle whitespace=delete>1.3.10</define-tag>
23 23
 <define-tag version-torbrowser-tor whitespace=delete>0.2.1.26</define-tag>
24 24
 <define-tag version-torbrowser-tor-components whitespace=delete>libevent-1.4.13, zlib-1.2.3, openssl-0.9.8l</define-tag>
25
-<define-tag version-torbrowser-firefox whitespace=delete>3.5.11</define-tag>
25
+<define-tag version-torbrowser-firefox whitespace=delete>3.6.10</define-tag>
26 26
 <define-tag version-torbrowser-torbutton whitespace=delete>1.2.5</define-tag>
27 27
 <define-tag version-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag>
28
-<define-tag version-torbrowser-pidgin whitespace=delete>2.7.2</define-tag>
28
+<define-tag version-torbrowser-pidgin whitespace=delete>2.7.3</define-tag>
29 29
 <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag>
30
-<define-tag version-torbrowser-vidalia whitespace=delete>0.2.9</define-tag>
31
-<define-tag version-torimbrowserbundle whitespace=delete>1.3.9</define-tag>
30
+<define-tag version-torbrowser-vidalia whitespace=delete>0.2.10</define-tag>
31
+<define-tag version-torimbrowserbundle whitespace=delete>1.3.10</define-tag>
32 32
 
33
-<define-tag version-torbrowserbundlelinux whitespace=delete>1.0.9</define-tag>
34
-<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.14-alpha</define-tag>
33
+<define-tag version-torbrowserbundlelinux whitespace=delete>1.0.13</define-tag>
34
+<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.17-alpha</define-tag>
35 35
 <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-1.4.13, zlib-1.2.3, openssl-0.9.8l</define-tag>
36
-<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.5.10</define-tag>
36
+<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.10</define-tag>
37 37
 <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.2.5</define-tag>
38 38
 <define-tag version-gnu-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag>
39
-<define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.9</define-tag>
39
+<define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.10</define-tag>
40 40
 
41
-<define-tag version-vidalia-stable whitespace=delete>0.2.9</define-tag>
41
+<define-tag version-torbrowserbundleosx whitespace=delete>1.0.2</define-tag>
42
+<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.17-alpha</define-tag>
43
+<define-tag version-osx-torbrowser-tor-components whitespace=delete>libevent-1.4.13, zlib-1.2.3, openssl-0.9.8l</define-tag>
44
+<define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.10</define-tag>
45
+<define-tag version-osx-torbrowser-torbutton whitespace=delete>1.2.5</define-tag>
46
+<define-tag version-osx-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag>
47
+<define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.10</define-tag>
42 48
 
43
-<define-tag version-androidbundle-tor whitespace=delete>0.2.2.13-alpha</define-tag>
44
-<define-tag version-androidbundle-orbot whitespace=delete>0.0.8</define-tag>
49
+<define-tag version-vidalia-stable whitespace=delete>0.2.10</define-tag>
50
+
51
+<define-tag version-androidbundle-tor whitespace=delete>0.2.2.14-alpha</define-tag>
52
+<define-tag version-androidbundle-orbot whitespace=delete>1.0.4</define-tag>
45 53
 <define-tag version-androidbundle-privoxy whitespace=delete>privoxy-3.0.12-stable</define-tag>
46 54
 <define-tag version-androidbundle-libevent whitespace=delete>libevent-1.4.12-stable</define-tag>
47 55
 <define-tag package-androidbundle-alpha whitespace=delete>dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk</define-tag>
... ...
@@ -50,13 +58,13 @@
50 58
 <define-tag package-win32-stable whitespace=delete>dist/win32/tor-<version-win32-stable>-win32.exe</define-tag>
51 59
 <define-tag package-win32-alpha whitespace=delete>dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag>
52 60
 
53
-<define-tag local-win32-bundle-stable whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-win32-bundle-stable>-0.2.9.exe</define-tag>
54
-<define-tag local-win32-bundle-alpha whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-win32-bundle-alpha>-0.2.9.exe</define-tag> 
61
+<define-tag local-win32-bundle-stable whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-win32-bundle-stable>-0.2.10.exe</define-tag>
62
+<define-tag local-win32-bundle-alpha whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-win32-bundle-alpha>-0.2.10.exe</define-tag> 
55 63
 <define-tag package-win32-bundle-stable whitespace=delete><local-win32-bundle-stable></define-tag>
56 64
 <define-tag package-win32-bundle-alpha whitespace=delete><local-win32-bundle-alpha></define-tag>
57 65
 
58
-<define-tag package-osx-bundle-stable whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-osx-bundle-stable>-0.2.9-i386.dmg</define-tag>
59
-<define-tag package-osx-bundle-alpha whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-osx-bundle-alpha>-0.2.9-i386.dmg</define-tag>
66
+<define-tag package-osx-bundle-stable whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-osx-bundle-stable>-0.2.10-i386.dmg</define-tag>
67
+<define-tag package-osx-bundle-alpha whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-osx-bundle-alpha>-0.2.10-i386.dmg</define-tag>
60 68
 
61 69
 <define-tag package-oldosx-bundle-stable whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-oldosx-bundle-stable>-0.2.8-ppc.dmg</define-tag>
62 70
 <define-tag package-oldosx-bundle-alpha whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-oldosx-bundle-alpha>-0.2.9-ppc.dmg</define-tag>
... ...
@@ -96,3 +104,6 @@
96 104
 
97 105
 <define-tag version-torbutton whitespace=delete>1.2.5 (08 April 2010)</define-tag>
98 106
 <define-tag version-hash-torbutton whitespace=delete>sha1:e84592877593ad6119e829ac7199fd19333e101e</define-tag>
107
+
108
+<define-tag version-torbutton-alpha whitespace=delete>1.3.0-alpha (30 September 2010)</define-tag>
109
+<define-tag version-hash-torbutton-alpha whitespace=delete>sha1:be60421d92a455e6e7c25ade84da19db9f299e7e</define-tag>
99 110