rename easy-download to download-easy to match the rest of the naming convention. Add sigs to the tbb files as a hack. update verifying-signatures with actual package names since we have the technology to do so. rework the gpg sidenav blurb to match the download sig link.
Andrew Lewman commited on 2010-10-16 23:15:58
Zeige 6 geänderte Dateien mit 32 Einfügungen und 12 Löschungen.
- docs/en/sidenav.wmi feffc049a..4d3450a37
- docs/en/tor-doc-relay.wml cc9e4a63a..a85df8a70
- docs/en/verifying-signatures.wml 2a332ee21..d0aaba640
- download/en/easy-download.wml
- download/en/download-unix.wml 311fee09a..74a31a953
- download/en/download.wml e99c54e8d..f3791a48b
| ... | ... |
@@ -39,6 +39,9 @@ |
| 39 | 39 |
{'url' => 'docs/N900',
|
| 40 | 40 |
'txt' => 'Installing on Maemo/N900', |
| 41 | 41 |
}, |
| 42 |
+ {'url' => 'docs/verifying-signatures',
|
|
| 43 |
+ 'txt' => 'Verify our GPG signatures', |
|
| 44 |
+ }, |
|
| 42 | 45 |
{'url' => 'docs/tor-doc-web',
|
| 43 | 46 |
'txt' => 'Configuring your browser to use Tor', |
| 44 | 47 |
}], |
| ... | ... |
@@ -39,7 +39,7 @@ |
| 39 | 39 |
<p>Before you start, you need to make sure that Tor is up and running. |
| 40 | 40 |
</p> |
| 41 | 41 |
|
| 42 |
- <p>Visit our <a href="<page download/easy-download>">download page</a> and |
|
| 42 |
+ <p>Visit our <a href="<page download/download>">download page</a> and |
|
| 43 | 43 |
install the "Installation Bundle" for your OS. |
| 44 | 44 |
</p> |
| 45 | 45 |
|
| ... | ... |
@@ -16,8 +16,8 @@ |
| 16 | 16 |
by a file with the same name as the package and the extension |
| 17 | 17 |
".asc". These .asc files are GPG signatures. They allow you to verify |
| 18 | 18 |
the file you've downloaded is exactly the one that we intended you to |
| 19 |
- get. For example, vidalia-bundle-0.2.1.25-0.2.7.exe is accompanied by |
|
| 20 |
- vidalia-bundle-0.2.1.25-0.2.7.exe.asc.</p> |
|
| 19 |
+ get. For example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by |
|
| 20 |
+ tor-browser-<version-torbrowserbundle>_en-US.exe.asc.</p> |
|
| 21 | 21 |
|
| 22 | 22 |
<p>Of course, you'll need to have our GPG keys in your keyring: if you don't |
| 23 | 23 |
know the GPG key, you can't be sure that it was really us who signed it. The |
| ... | ... |
@@ -167,7 +167,7 @@ changes in both stable and development versions, see the |
| 167 | 167 |
<div class="img-shadow"> |
| 168 | 168 |
<div class="infoblock"> |
| 169 | 169 |
<h2>Verify Signatures</h2> |
| 170 |
- <p>Verify your downloads with our PGP signatures:</p> |
|
| 170 |
+ <p>Verify your downloads with our GPG signatures:</p> |
|
| 171 | 171 |
<a href="<page docs/verifying-signatures>">Read how to |
| 172 | 172 |
verify the signatures</a>. |
| 173 | 173 |
</div> |
| ... | ... |
@@ -30,19 +30,35 @@ |
| 30 | 30 |
<tr class="beige"> |
| 31 | 31 |
<td>English (en-US)</td> |
| 32 | 32 |
<td><version-torbrowserbundle></td> |
| 33 |
- <td><span class="windows"><a href="/dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe">Download</a></span></td> |
|
| 34 |
- <td><span class="windows"><a href="/dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.tar.gz">Download Tarball</a></span></td> |
|
| 33 |
+ <td><span class="windows"> |
|
| 34 |
+ <a href="/dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe">Download</a> |
|
| 35 |
+ (<a href="/dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe.asc">sig</a>) |
|
| 36 |
+ </span> |
|
| 37 |
+ </td> |
|
| 38 |
+ <td><span class="windows"> |
|
| 39 |
+ <a href="/dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.tar.gz">Download Tarball</a> |
|
| 40 |
+ (<a href="/dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.tar.gz.asc">sig</a>) |
|
| 41 |
+ </span> |
|
| 42 |
+ </td> |
|
| 35 | 43 |
</tr> |
| 36 | 44 |
<tr> |
| 37 | 45 |
<td>English (en-US)</td> |
| 38 | 46 |
<td><version-torbrowserbundlelinux></td> |
| 39 |
- <td><span class="linux"><a href="/dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a></span></td> |
|
| 47 |
+ <td><span class="linux"> |
|
| 48 |
+ <a href="/dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a> |
|
| 49 |
+ (<a href="/dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz.asc">sig</a>) |
|
| 50 |
+ </span> |
|
| 51 |
+ </td> |
|
| 40 | 52 |
<td></td> |
| 41 | 53 |
</tr> |
| 42 | 54 |
<tr class="beige"> |
| 43 | 55 |
<td>English (en-US)</td> |
| 44 | 56 |
<td><version-torbrowserbundleosx></td> |
| 45 |
- <td><span class="mac"><a href="/dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">Download</a></span></td> |
|
| 57 |
+ <td><span class="mac"> |
|
| 58 |
+ <a href="/dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">Download</a> |
|
| 59 |
+ (<a href="/dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc">sig</a>) |
|
| 60 |
+ </span> |
|
| 61 |
+ </td> |
|
| 46 | 62 |
<td></td> |
| 47 | 63 |
</tr> |
| 48 | 64 |
</table> |
| ... | ... |
@@ -274,10 +290,11 @@ all the issues</a>. |
| 274 | 290 |
<!-- END SIDENAV --> |
| 275 | 291 |
<div class="img-shadow"> |
| 276 | 292 |
<div class="infoblock"> |
| 277 |
- <h2>Verify Signatures</h2> |
|
| 278 |
- <p>Verify your downloads with our PGP signatures:</p> |
|
| 279 |
- <a href="<page docs/verifying-signatures>">Read how to |
|
| 280 |
-verify the signatures</a>. |
|
| 293 |
+ <h2>What is the (sig) link?</h2> |
|
| 294 |
+ <p>These are GPG signatures to allow you to verify your |
|
| 295 |
+ downloaded file is really from The Tor Project and not |
|
| 296 |
+ an imposter.</p> |
|
| 297 |
+ <a href="<page docs/verifying-signatures>">Learn more »</a>. |
|
| 281 | 298 |
</div> |
| 282 | 299 |
</div> |
| 283 | 300 |
<!-- END INFOBLOCK --> |
| 284 | 301 |