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.
This commit is contained in:
Andrew Lewman 2010-10-16 21:15:58 +00:00
parent dbbc7ac246
commit 3fb9e00162
6 changed files with 32 additions and 12 deletions

View File

@ -39,6 +39,9 @@
{'url' => 'docs/N900',
'txt' => 'Installing on Maemo/N900',
},
{'url' => 'docs/verifying-signatures',
'txt' => 'Verify our GPG signatures',
},
{'url' => 'docs/tor-doc-web',
'txt' => 'Configuring your browser to use Tor',
}],

View File

@ -39,7 +39,7 @@
<p>Before you start, you need to make sure that Tor is up and running.
</p>
<p>Visit our <a href="<page download/easy-download>">download page</a> and
<p>Visit our <a href="<page download/download>">download page</a> and
install the "Installation Bundle" for your OS.
</p>

View File

@ -16,8 +16,8 @@
by a file with the same name as the package and the extension
".asc". These .asc files are GPG signatures. They allow you to verify
the file you've downloaded is exactly the one that we intended you to
get. For example, vidalia-bundle-0.2.1.25-0.2.7.exe is accompanied by
vidalia-bundle-0.2.1.25-0.2.7.exe.asc.</p>
get. For example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by
tor-browser-<version-torbrowserbundle>_en-US.exe.asc.</p>
<p>Of course, you'll need to have our GPG keys in your keyring: if you don't
know the GPG key, you can't be sure that it was really us who signed it. The

View File

@ -167,7 +167,7 @@ changes in both stable and development versions, see the
<div class="img-shadow">
<div class="infoblock">
<h2>Verify Signatures</h2>
<p>Verify your downloads with our PGP signatures:</p>
<p>Verify your downloads with our GPG signatures:</p>
<a href="<page docs/verifying-signatures>">Read how to
verify the signatures</a>.
</div>

View File

@ -30,19 +30,35 @@
<tr class="beige">
<td>English (en-US)</td>
<td><version-torbrowserbundle></td>
<td><span class="windows"><a href="/dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe">Download</a></span></td>
<td><span class="windows"><a href="/dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.tar.gz">Download Tarball</a></span></td>
<td><span class="windows">
<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>)
</span>
</td>
<td><span class="windows">
<a href="/dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.tar.gz">Download Tarball</a>&nbsp;
(<a href="/dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.tar.gz.asc">sig</a>)
</span>
</td>
</tr>
<tr>
<td>English (en-US)</td>
<td><version-torbrowserbundlelinux></td>
<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>
<td><span class="linux">
<a href="/dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a>&nbsp;
(<a href="/dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz.asc">sig</a>)
</span>
</td>
<td></td>
</tr>
<tr class="beige">
<td>English (en-US)</td>
<td><version-torbrowserbundleosx></td>
<td><span class="mac"><a href="/dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">Download</a></span></td>
<td><span class="mac">
<a href="/dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">Download</a>
(<a href="/dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc">sig</a>)
</span>
</td>
<td></td>
</tr>
</table>
@ -274,10 +290,11 @@ all the issues</a>.
<!-- END SIDENAV -->
<div class="img-shadow">
<div class="infoblock">
<h2>Verify Signatures</h2>
<p>Verify your downloads with our PGP signatures:</p>
<a href="<page docs/verifying-signatures>">Read how to
verify the signatures</a>.
<h2>What is the (sig) link?</h2>
<p>These are GPG signatures to allow you to verify your
downloaded file is really from The Tor Project and not
an imposter.</p>
<a href="<page docs/verifying-signatures>">Learn more &raquo;</a>.
</div>
</div>
<!-- END INFOBLOCK -->