commit 76e5bbfbf51dc0b6a52ccfff118ffb4750f58078 Author: Sebastian Hahn sebastian@torproject.org Date: Wed Aug 17 09:06:10 2016 +0200
Prefer 64bit on Linux --- download/en/download-easy.wml | 34 +++++++++++++++++----------------- download/en/download.wml | 23 ++++++++++++----------- 2 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml index 4bb1517..c740b78 100644 --- a/download/en/download-easy.wml +++ b/download/en/download-easy.wml @@ -76,44 +76,44 @@ <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">Linux</a></p> </div> </div> -<!-- START LINUX --> - <div id="linux" class="easy linux"> +<!-- START LINUX 64-Bit --> + <div class="easy linux"> <div class="package" style="padding-top: 13px; border-top: 0px;"> <div class="desc"> - <h2>Tor Browser for Linux</h2> - <em>Version <version-torbrowserbundlelinux32> - Linux (32-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a> - <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /> - <a href="<page projects/torbrowser>">Learn more »</a></p> + <h2>Tor Browser for Linux (64-Bit)</h2> + <em>Version <version-torbrowserbundlelinux64> - Linux (64-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a> + <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more »</a></p> </div> <form class="downloads"> - <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a> - <select name="language" id="lin-tbb32" class="lang"> + <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a> + <select name="language" id="lin-tbb64" class="lang"> #include <lang.wmi> </select> <div class="sig" style="margin-bottom: 5px;"> <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a> - (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p> </div> </div> -<!-- START LINUX 64-Bit --> - <div class="easy linux"> +<!-- START LINUX --> + <div id="linux" class="easy linux"> <div class="package" style="padding-top: 13px; border-top: 0px;"> <div class="desc"> - <h2>Tor Browser for 64-Bit Linux</h2> - <em>Version <version-torbrowserbundlelinux64> - Linux (64-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a> - <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more »</a></p> + <h2>Tor Browser for Linux (32-Bit)</h2> + <em>Version <version-torbrowserbundlelinux32> - Linux (32-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a> + <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /> + <a href="<page projects/torbrowser>">Learn more »</a></p> </div> <form class="downloads"> - <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a> - <select name="language" id="lin-tbb64" class="lang"> + <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a> + <select name="language" id="lin-tbb32" class="lang"> #include <lang.wmi> </select> <div class="sig" style="margin-bottom: 5px;"> <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a> - (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p> diff --git a/download/en/download.wml b/download/en/download.wml index 0f3550a..571c7f8 100644 --- a/download/en/download.wml +++ b/download/en/download.wml @@ -14,8 +14,8 @@ <define-tag button-win-tbb64>Currently Unused</define-tag> <define-tag button-osx-tbb32>Tor Browser</define-tag> #<!-- Comment out until it's available again. -EC <define-tag button-osx-tbb64>64-bit</define-tag> --> -<define-tag button-lin-tbb32>Tor Browser</define-tag> -<define-tag button-lin-tbb64>64-bit</define-tag> +<define-tag button-lin-tbb32>Tor Browser (32-Bit)</define-tag> +<define-tag button-lin-tbb64>Tor Browser (64-Bit)</define-tag>
#include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8"
@@ -121,26 +121,27 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo #<!-- NOTE - change language enabled button text at the top of this page --> <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a> - <select name="language" id="lin-tbb32" class="lang"> + <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a> + <select name="language" id="lin-tbb64" class="lang"> #include <lang.wmi> </select> <div class="sig"> <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a> - (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> -<!-- <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz.asc">sig</a>)<p>--> + <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br /> +<!-- <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">sig</a>)-->
- <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a> - <select name="language" id="lin-tbb64" class="lang"> + <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a> + <select name="language" id="lin-tbb32" class="lang"> #include <lang.wmi> </select> <div class="sig"> <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a> - (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> - <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br /> -<!-- <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">sig</a>)--> +<!-- <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz.asc">sig</a>)<p>--> + </form>
<h2>Tor Browser</h2>