From 3fb9e00162aa924d77384e69ca4769d8007f3832 Mon Sep 17 00:00:00 2001 From: Andrew Lewman Date: Sat, 16 Oct 2010 21:15:58 +0000 Subject: [PATCH] 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. --- docs/en/sidenav.wmi | 3 ++ docs/en/tor-doc-relay.wml | 2 +- docs/en/verifying-signatures.wml | 4 +-- .../{easy-download.wml => download-easy.wml} | 0 download/en/download-unix.wml | 2 +- download/en/download.wml | 33 ++++++++++++++----- 6 files changed, 32 insertions(+), 12 deletions(-) rename download/en/{easy-download.wml => download-easy.wml} (100%) diff --git a/docs/en/sidenav.wmi b/docs/en/sidenav.wmi index feffc049..4d3450a3 100644 --- a/docs/en/sidenav.wmi +++ b/docs/en/sidenav.wmi @@ -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', }], diff --git a/docs/en/tor-doc-relay.wml b/docs/en/tor-doc-relay.wml index cc9e4a63..a85df8a7 100644 --- a/docs/en/tor-doc-relay.wml +++ b/docs/en/tor-doc-relay.wml @@ -39,7 +39,7 @@

Before you start, you need to make sure that Tor is up and running.

-

Visit our download page and +

Visit our download page and install the "Installation Bundle" for your OS.

diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml index 2a332ee2..d0aaba64 100644 --- a/docs/en/verifying-signatures.wml +++ b/docs/en/verifying-signatures.wml @@ -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.

+ get. For example, tor-browser-_en-US.exe is accompanied by + tor-browser-_en-US.exe.asc.

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 diff --git a/download/en/easy-download.wml b/download/en/download-easy.wml similarity index 100% rename from download/en/easy-download.wml rename to download/en/download-easy.wml diff --git a/download/en/download-unix.wml b/download/en/download-unix.wml index 311fee09..74a31a95 100644 --- a/download/en/download-unix.wml +++ b/download/en/download-unix.wml @@ -167,7 +167,7 @@ changes in both stable and development versions, see the

Verify Signatures

-

Verify your downloads with our PGP signatures:

+

Verify your downloads with our GPG signatures:

Read how to verify the signatures.
diff --git a/download/en/download.wml b/download/en/download.wml index e99c54e8..f3791a48 100644 --- a/download/en/download.wml +++ b/download/en/download.wml @@ -30,19 +30,35 @@ English (en-US) - Download - Download Tarball + + Download  + (sig) + + + + Download Tarball  + (sig) + + English (en-US) - Download + + Download  + (sig) + + English (en-US) - Download + + Download + (sig) + + @@ -274,10 +290,11 @@ all the issues.
-

Verify Signatures

-

Verify your downloads with our PGP signatures:

- Read how to -verify the signatures. +

What is the (sig) link?

+

These are GPG signatures to allow you to verify your + downloaded file is really from The Tor Project and not + an imposter.

+ Learn more ».