commit 3b9e68b9970f118c4e5d1acddbed9851892f7d4e Author: Sebastian Hahn <sebastian@torproject.org> Date: Wed Mar 30 09:32:11 2016 +0200 Offend everyone thoroughly - remove one FAQ entry - consistently say Linux, not GNU/Linux - remove references of FreeBSD in TB context --- docs/en/faq.wml | 56 +------------------------------------------ download/en/download-easy.wml | 18 +++++++------- download/en/download.wml | 2 +- 3 files changed, 11 insertions(+), 65 deletions(-) diff --git a/docs/en/faq.wml b/docs/en/faq.wml index 9c7f19e..1385eac 100644 --- a/docs/en/faq.wml +++ b/docs/en/faq.wml @@ -155,8 +155,6 @@ be?</a></li> limiting bandwidth on my Tor relay?</a></li> <li><a href="#ExitPolicies">I'd run a relay, but I don't want to deal with abuse issues.</a></li> - <li><a href="#BestOSForRelay">Why doesn't my Windows (or other OS) Tor - relay run well?</a></li> <li><a href="#PackagedTor">Should I install Tor from my package manager, or build from source?</a></li> <li><a href="#WhatIsTheBadExitFlag">What is the BadExit flag?</a></li> @@ -1799,7 +1797,7 @@ for details. <li> If it's still vanishing mysteriously, perhaps something else is killing it? Do you have resource limits (ulimits) configured that kill off processes -sometimes? (This is especially common on OpenBSD.) On Linux, try running +sometimes? On Linux, try running "dmesg" to see if the out-of-memory killer removed your process. (Tor will exit cleanly if it notices that it's run out of memory, but in some cases it might not have time to notice.) In very rare circumstances, hardware @@ -2446,50 +2444,6 @@ users <hr> - <a id="BestOSForRelay"></a> - <h3><a class="anchor" href="#BestOSForRelay">Why doesn't my Windows (or other OS) Tor relay run well?</h3></a> - - <p> - Tor relays work best on Linux, FreeBSD 5.x+, OS X Tiger or - later, and Windows Server 2003 or later. - </p> - - <p>You can probably get it working just fine on other operating - systems too, but note the following caveats: - </p> - - <ul> - <li> - Versions of Windows without the word "server" in their name - sometimes have problems. This is especially the case for Win98, - but it also happens in some cases for XP, especially if you don't - have much memory. The problem is that we don't use the networking - system calls in a very Windows-like way, so we run out of space in - a fixed-size memory space known as the non-page pool, and then - everything goes bad. The symptom is an assert error with the - message "No buffer space available [WSAENOBUFS ] [10055]". <a - href="https://trac.torproject.org/projects/tor/wiki/doc/WindowsBufferProblems">You - can read more here.</a> - </li> - - <li> - Most developers who contribute to Tor work with Unix-like operating - systems. It would be great if more people with Windows experience help - out, so we can improve Tor's usability and stability in - Windows. - </li> - - <li> - More esoteric or archaic operating systems, like SunOS 5.9 or - Irix64, may have problems with some libevent methods (devpoll, - etc), probably due to bugs in libevent. If you experience crashes, - try setting the EVENT_NODEVPOLL or equivalent environment - variable. - </li> - </ul> - - <hr> - <a id="PackagedTor"></a> <h3><a class="anchor" href="#PackagedTor">Should I install Tor from my package manager, or build from source?</a></h3> @@ -2975,14 +2929,6 @@ connections use this feature.</li> -<!-- Nickm says he's not sure this is still accurate - - <li>If you're running on Solaris, OpenBSD, NetBSD, or - old FreeBSD, Tor is probably forking separate processes - rather than using threads. Consider switching to a <a - href="<wikifaq>#WhydoesntmyWindowsorotherOSTorrelayrunwell">better - operating system</a>.</li> ---> <li>If you still can't handle the memory load, consider reducing the amount of bandwidth your relay advertises. Advertising less bandwidth diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml index e2bb72a..7a85413 100644 --- a/download/en/download-easy.wml +++ b/download/en/download-easy.wml @@ -14,7 +14,7 @@ <define-tag button-win-tbb64>Currently Unused</define-tag> <define-tag button-osx-tbb32>Tor Browser</define-tag> <define-tag button-lin-tbb32>Tor Browser</define-tag> -<define-tag button-lin-tbb64>GNU/Linux 64-bit</define-tag> +<define-tag button-lin-tbb64>Linux 64-bit</define-tag> #include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8" @@ -52,7 +52,7 @@ (<a class="win-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> - <p class="alt-dl">Not Using Windows?<br />Download for <a href="#mac">Mac</a> or <a href="#linux">GNU/Linux</a></p> + <p class="alt-dl">Not Using Windows?<br />Download for <a href="#mac">Mac</a> or <a href="#linux">Linux</a></p> </div> </div> <!-- START MAC --> @@ -73,7 +73,7 @@ (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> - <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p> + <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">Linux</a></p> </div> <!-- To update these screenshots: Press Command-Shift-4 and then Spacebar, then click on the window. See #14838. --> <table class="howto"> @@ -98,8 +98,8 @@ <div id="linux" class="easy linux"> <div class="package" style="padding-top: 13px; border-top: 0px;"> <div class="desc"> - <h2>Tor Browser for GNU/Linux</h2> - <em>Version <version-torbrowserbundlelinux32> - Linux, FreeBSD (32-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a> + <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> </div> @@ -113,14 +113,14 @@ (<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 GNU/Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p> + <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"> <div class="package" style="padding-top: 13px; border-top: 0px;"> <div class="desc"> - <h2>Tor Browser for 64-Bit GNU/Linux</h2> + <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> </div> @@ -134,7 +134,7 @@ (<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 GNU/Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p> + <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p> </div> </div> <!-- START Orbot --> @@ -339,7 +339,7 @@ are blocked.</p> <ul> <li class="dropdown"><a href="#windows">Microsoft Windows</a></li> <li class="dropdown"><a href="#mac">Apple OS X</a></li> -<li class="dropdown"><a href="#linux">Linux/FreeBSD</a></li> +<li class="dropdown"><a href="#linux">Linux</a></li> <li class="dropdown"><a href="#android">Android</a></li> <li class="dropdown"><a href="<page download/download>">All Downloads</a></li> </ul> diff --git a/download/en/download.wml b/download/en/download.wml index 556581e..0f3550a 100644 --- a/download/en/download.wml +++ b/download/en/download.wml @@ -114,7 +114,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo <!-- END OS X --> <!-- START UNIX --> <div id="linux" class="accordionButton on"> - <span class="linux24">GNU/Linux, BSD, and Unix</span></div> + <span class="linux24">Linux</span></div> <div class="accordionContent"> <div class="fauxhead"></div> <!-- TOR BROWSER BUNDLE -->