commit d820ced636fd30fbf43f4f5399582a4956d7f6d3 Author: Nicolas Vigier boklm@torproject.org Date: Thu Nov 16 12:34:53 2017 +0100

Remove old osx32 variables and comments --- download/en/download-easy.wml | 4 ++-- download/en/download.wml | 18 ++---------------- include/versions.wmi | 2 -- 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml index 90aa6614..8ba1d00e 100644 --- a/download/en/download-easy.wml +++ b/download/en/download-easy.wml @@ -12,7 +12,7 @@ #<!-- Download button text for language enabled packages --> <define-tag button-win-tbb32>Tor Browser</define-tag> <define-tag button-win-tbb64>Currently Unused</define-tag> -<define-tag button-osx-tbb32>Tor Browser</define-tag> +<define-tag button-osx-tbb64>Tor Browser</define-tag> <define-tag button-lin-tbb32>Tor Browser</define-tag> <define-tag button-lin-tbb64>Linux 64-bit</define-tag>

@@ -64,7 +64,7 @@ <p>Everything you need to safely browse the Internet.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p> </div> <form class="downloads"> - <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a> + <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a> <select name="language" id="osx-tbb" class="lang"> #include <lang.wmi> </select> diff --git a/download/en/download.wml b/download/en/download.wml index 7a81b62e..b6149b51 100644 --- a/download/en/download.wml +++ b/download/en/download.wml @@ -12,7 +12,7 @@ #<!-- Download button text for language enabled packages --> <define-tag button-win-tbb32>Tor Browser</define-tag> <define-tag button-win-tbb64>Currently Unused</define-tag> -<define-tag button-osx-tbb32>Tor Browser</define-tag> +<define-tag button-osx-tbb64>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 (32-Bit)</define-tag> <define-tag button-lin-tbb64>Tor Browser (64-Bit)</define-tag> @@ -81,7 +81,7 @@ 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 osx-tbb" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a> + <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a> <select name="language" id="osx-tbb" class="lang"> #include <lang.wmi> </select> @@ -90,20 +90,6 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg.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 /> -# Comment out until 64-bit Mac OS X bundles are available again -# <a class="button osx-tbb64" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a> -# <select name="language" id="osx-tbb64" class="lang"> - -# NO #include <lang.wmi> -# </select> -# <div class="sig"> -# <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a> -#<!-- Mac OS X 64. -EC -# (<a class="osx-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> -# </div> -# <a href="<page projects/torbrowser-details>#build">Source Code</a><br /> -# <a class="additional" href="../dist/torbrowser/<version-torbrowserbundleosx32alpha>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundleosx32alpha>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">sig</a>) - </form>

<h2>Tor Browser</h2> diff --git a/include/versions.wmi b/include/versions.wmi index c3b2a627..9c75a2d8 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -19,8 +19,6 @@ <define-tag version-torbrowserbundlelinux64beta whitespace=delete>7.5a7</define-tag> <define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2017-11-04</define-tag>

-<define-tag version-torbrowserbundleosx32 whitespace=delete>7.0.10</define-tag> -<define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2017-11-14</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>7.0.10</define-tag> <define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2017-11-14</define-tag> <define-tag version-torbrowserbundleosx64beta whitespace=delete>7.5a7</define-tag>