Author: phobos
Date: 2010-10-16 21:15:58 +0000 (Sat, 16 Oct 2010)
New Revision: 23616
Added:
website/trunk/download/en/download-easy.wml
Removed:
website/trunk/download/en/easy-download.wml
Modified:
website/trunk/docs/en/sidenav.wmi
website/trunk/docs/en/tor-doc-relay.wml
website/trunk/docs/en/verifying-signatures.wml
website/trunk/download/en/download-unix.wml
website/trunk/download/en/download.wml
Log:
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.
Modified: website/trunk/docs/en/sidenav.wmi
===================================================================
--- website/trunk/docs/en/sidenav.wmi 2010-10-16 21:14:33 UTC (rev 23615)
+++ website/trunk/docs/en/sidenav.wmi 2010-10-16 21:15:58 UTC (rev 23616)
@@ -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',
}],
Modified: website/trunk/docs/en/tor-doc-relay.wml
===================================================================
--- website/trunk/docs/en/tor-doc-relay.wml 2010-10-16 21:14:33 UTC (rev
23615)
+++ website/trunk/docs/en/tor-doc-relay.wml 2010-10-16 21:15:58 UTC (rev
23616)
@@ -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>
Modified: website/trunk/docs/en/verifying-signatures.wml
===================================================================
--- website/trunk/docs/en/verifying-signatures.wml 2010-10-16 21:14:33 UTC
(rev 23615)
+++ website/trunk/docs/en/verifying-signatures.wml 2010-10-16 21:15:58 UTC
(rev 23616)
@@ -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
Copied: website/trunk/download/en/download-easy.wml (from rev 23610,
website/trunk/download/en/easy-download.wml)
===================================================================
--- website/trunk/download/en/download-easy.wml (rev 0)
+++ website/trunk/download/en/download-easy.wml 2010-10-16 21:15:58 UTC (rev
23616)
@@ -0,0 +1,95 @@
+## translation metadata
+# Revision: $Revision: 21396 $
+# Translation-Priority: 1-high
+
+#include "head.wmi" TITLE="Tor: Download" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
+
+<div class="main-column">
+
+<h3>Download Now - Free & Open Source Software</h3>
+<hr>
+<table width="99%" cellspacing="0" cellpadding="3">
+<tr>
+<th bgcolor="#e5e5e5" align="center" width="25%"><img
src="$(IMGROOT)/logo.windows-header.gif"/></th>
+<th align="center" width="25%"><img src="$(IMGROOT)/ref_leopard_box.jpg"/></th>
+<th bgcolor="#e5e5e5" align="center" width="25%"><img
src="$(IMGROOT)/logo.windows-header.gif"/></th>
+<th align="center" width="25%"><img src="$(IMGROOT)/distros/generic.png"/><img
src="$(IMGROOT)/distros/freebsd.png"/><img
src="$(IMGROOT)/distros/package.png"/><img
src="$(IMGROOT)/distros/src.png"/></th>
+</tr>
+<tr>
+<td bgcolor="#e5e5e5" align="center">
+# Translators: please point to the version of TBB in your language,
+# if there is one.
+<a href="torbrowser/dist/tor-browser-<version-torbrowserbundle>_en-US.exe">Tor
Browser Bundle for Windows</a>
+</td>
+<td align="center">
+<a href="<package-osx-bundle-stable>">Installation Bundle for Apple OS X</a>
+</td>
+<td bgcolor="#e5e5e5" align="center">
+<a href="<package-win32-bundle-stable>">Installation Bundle for
+Windows</a>
+</td>
+</tr>
+<tr>
+<td bgcolor="#e5e5e5" align="center">Zero installation. Great for USB
+drives! Pre-configured with Firefox and more. <a href="<page
+projects/torbrowser>">More details and languages</a>.</td>
+<td align="center">Simple. Drag and Drop Install. i386-only. <a href="<page
+download/download>">PowerPC? Go here.</a></td>
+<td bgcolor="#e5e5e5" align="center">Easy to Install.</td>
+<td align="center">
+<a href="<page download/download>">Linux/BSD/Unix/Source</a>
+</td>
+</tr>
+</table>
+
+<div class="underline"></div>
+<div class="warning">
+Tor does <strong>not</strong> magically encrypt all of your Internet
activities.
+Understand what Tor does and does not do for you. <a href="<page
+download/download>#Warning">Read more about this topic</a>.
+</div>
+
+<div class="underline"></div>
+<div class="nb">
+<p>Need more download options? <a href="<page download/download>">See
advanced choices</a>.</p>
+</div>
+
+<div class="underline"></div>
+<div class="nb">
+<p>Verify the signatures for the downloads above (<a href="<page
docs/verifying-signatures>">How?</a>):</p>
+ <ul>
+ <li><a
href="torbrowser/dist/tor-browser-<version-torbrowserbundle>_en-US.exe.asc">Tor
Browser Bundle for Windows signature</a></li>
+ <li><a href="<package-win32-bundle-stable-sig>">Installation Bundle for
Windows signature</a></li>
+ <li><a href="<package-osx-bundle-stable-sig>">Installation Bundle for OS X
signature</a></li>
+ </ul>
+</div>
+
+<div class="underline"></div>
+<div class="nb">
+<p>Interested in <a href="<page about/overview>">learning more about Tor in
general</a>?</p>
+</div>
+
+<div class="underline"></div>
+<div class="nb">
+<p>
+To keep informed of security advisories and new stable releases, subscribe
+to the <a href="http://archives.seul.org/or/announce/";>or-announce
+mailing list</a> (you will be asked to confirm via email). You can also
+<a href="http://rss.gmane.org/gmane.network.onion-routing.announce";>watch
+the list's RSS feed</a>.
+</p>
+
+<form action="http://freehaven.net/cgi-bin/majordomo.cgi";>
+<input type="hidden" name="mlist" value="or-announce"/>
+<input type="hidden" name="subscribe" value="1"/>
+<input type="hidden" name="host" value="freehaven.net"/>
+<input name="email" size="15"/>
+<input type="submit" value="subscribe to or-announce"/>
+</form>
+</div>
+
+<p>All trademarks are the property of their respective owners.</p>
+</div><!-- #main -->
+
+#include <foot.wmi>
+
Modified: website/trunk/download/en/download-unix.wml
===================================================================
--- website/trunk/download/en/download-unix.wml 2010-10-16 21:14:33 UTC (rev
23615)
+++ website/trunk/download/en/download-unix.wml 2010-10-16 21:15:58 UTC (rev
23616)
@@ -167,7 +167,7 @@
<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>
Modified: website/trunk/download/en/download.wml
===================================================================
--- website/trunk/download/en/download.wml 2010-10-16 21:14:33 UTC (rev
23615)
+++ website/trunk/download/en/download.wml 2010-10-16 21:15:58 UTC (rev
23616)
@@ -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>
+ (<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>
+ (<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>
+ (<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 @@
<!-- 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 »</a>.
</div>
</div>
<!-- END INFOBLOCK -->
Deleted: website/trunk/download/en/easy-download.wml
===================================================================
--- website/trunk/download/en/easy-download.wml 2010-10-16 21:14:33 UTC (rev
23615)
+++ website/trunk/download/en/easy-download.wml 2010-10-16 21:15:58 UTC (rev
23616)
@@ -1,95 +0,0 @@
-## translation metadata
-# Revision: $Revision: 21396 $
-# Translation-Priority: 1-high
-
-#include "head.wmi" TITLE="Tor: Download" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
-
-<div class="main-column">
-
-<h3>Download Now - Free & Open Source Software</h3>
-<hr>
-<table width="99%" cellspacing="0" cellpadding="3">
-<tr>
-<th bgcolor="#e5e5e5" align="center" width="25%"><img
src="$(IMGROOT)/logo.windows-header.gif"/></th>
-<th align="center" width="25%"><img src="$(IMGROOT)/ref_leopard_box.jpg"/></th>
-<th bgcolor="#e5e5e5" align="center" width="25%"><img
src="$(IMGROOT)/logo.windows-header.gif"/></th>
-<th align="center" width="25%"><img src="$(IMGROOT)/distros/generic.png"/><img
src="$(IMGROOT)/distros/freebsd.png"/><img
src="$(IMGROOT)/distros/package.png"/><img
src="$(IMGROOT)/distros/src.png"/></th>
-</tr>
-<tr>
-<td bgcolor="#e5e5e5" align="center">
-# Translators: please point to the version of TBB in your language,
-# if there is one.
-<a href="torbrowser/dist/tor-browser-<version-torbrowserbundle>_en-US.exe">Tor
Browser Bundle for Windows</a>
-</td>
-<td align="center">
-<a href="<package-osx-bundle-stable>">Installation Bundle for Apple OS X</a>
-</td>
-<td bgcolor="#e5e5e5" align="center">
-<a href="<package-win32-bundle-stable>">Installation Bundle for
-Windows</a>
-</td>
-</tr>
-<tr>
-<td bgcolor="#e5e5e5" align="center">Zero installation. Great for USB
-drives! Pre-configured with Firefox and more. <a href="<page
-projects/torbrowser>">More details and languages</a>.</td>
-<td align="center">Simple. Drag and Drop Install. i386-only. <a href="<page
-download/download>">PowerPC? Go here.</a></td>
-<td bgcolor="#e5e5e5" align="center">Easy to Install.</td>
-<td align="center">
-<a href="<page download/download>">Linux/BSD/Unix/Source</a>
-</td>
-</tr>
-</table>
-
-<div class="underline"></div>
-<div class="warning">
-Tor does <strong>not</strong> magically encrypt all of your Internet
activities.
-Understand what Tor does and does not do for you. <a href="<page
-download/download>#Warning">Read more about this topic</a>.
-</div>
-
-<div class="underline"></div>
-<div class="nb">
-<p>Need more download options? <a href="<page download/download>">See
advanced choices</a>.</p>
-</div>
-
-<div class="underline"></div>
-<div class="nb">
-<p>Verify the signatures for the downloads above (<a href="<page
docs/verifying-signatures>">How?</a>):</p>
- <ul>
- <li><a
href="torbrowser/dist/tor-browser-<version-torbrowserbundle>_en-US.exe.asc">Tor
Browser Bundle for Windows signature</a></li>
- <li><a href="<package-win32-bundle-stable-sig>">Installation Bundle for
Windows signature</a></li>
- <li><a href="<package-osx-bundle-stable-sig>">Installation Bundle for OS X
signature</a></li>
- </ul>
-</div>
-
-<div class="underline"></div>
-<div class="nb">
-<p>Interested in <a href="<page about/overview>">learning more about Tor in
general</a>?</p>
-</div>
-
-<div class="underline"></div>
-<div class="nb">
-<p>
-To keep informed of security advisories and new stable releases, subscribe
-to the <a href="http://archives.seul.org/or/announce/";>or-announce
-mailing list</a> (you will be asked to confirm via email). You can also
-<a href="http://rss.gmane.org/gmane.network.onion-routing.announce";>watch
-the list's RSS feed</a>.
-</p>
-
-<form action="http://freehaven.net/cgi-bin/majordomo.cgi";>
-<input type="hidden" name="mlist" value="or-announce"/>
-<input type="hidden" name="subscribe" value="1"/>
-<input type="hidden" name="host" value="freehaven.net"/>
-<input name="email" size="15"/>
-<input type="submit" value="subscribe to or-announce"/>
-</form>
-</div>
-
-<p>All trademarks are the property of their respective owners.</p>
-</div><!-- #main -->
-
-#include <foot.wmi>
-
