[tor-commits] r26641: {website} Formatted the new FAQ entry; restored a deleted but still us (website/trunk/docs/en)

[Matt Pagan]

Author: mttp
Date: 2014-03-06 19:04:46 +0000 (Thu, 06 Mar 2014)
New Revision: 26641

Modified:
   website/trunk/docs/en/faq.wml
Log:
Formatted the new FAQ entry; restored a deleted but still useful entry. 



Modified: website/trunk/docs/en/faq.wml
===================================================================
--- website/trunk/docs/en/faq.wml	2014-03-06 16:52:25 UTC (rev 26640)
+++ website/trunk/docs/en/faq.wml	2014-03-06 19:04:46 UTC (rev 26641)
@@ -164,8 +164,6 @@
     <li><a href="#WhyIsntMyRelayBeingUsedMore">Why isn't my relay being 
     used more?</a></li>
     <li><a href="#IDontHaveAStaticIP">I don't have a static IP.</a></li>
-    <li><a href="#ModemKeepsCrashing">My cable/dsl modem keeps crashing. 
-    What's going on?</a></li>
     <li><a href="#PortscannedMore">Why do I get portscanned more often 
     when I run a Tor relay?</a></li>
     <li><a href="#MoreThanOneCPU">I have more than one CPU. Does this 
@@ -1102,6 +1100,22 @@
 
     <hr>
 
+    <a id="VirusFalsePositives"></a>
+    <h3><a class="anchor" href="#VirusFalsePositives"></a></h3>
+    <p>
+    Sometimes, overzealous Windows virus and spyware detectors trigger on 
+    some parts of the Tor Windows binary. Our best guess is that these are 
+    false positives — after all, the anti-virus and anti-spyware business is 
+    just a guessing game anyway. You should contact your vendor and explain 
+    that you have a program that seems to be triggering false positives. Or 
+    pick a better vendor.
+    </p>
+    <p>In the meantime, we encourage you to not just take our word for it. 
+    Our job is to provide the source; if you're concerned, please do 
+    recompile it yourself.</p>
+
+    <hr>
+
     <a id="tarballs"></a>
     <h3><a class="anchor" href="#tarballs">How do I open a .tar.gz 
     or .tar.xz file?</a></h3>
@@ -1109,7 +1123,7 @@
     <p>
     Tar is a common archive utility for Unix and Linux systems. If your
     system has a mouse, you can usually open them by double clicking. 
-    Otherwise open a command prompt and execute 
+    Otherwise open a command prompt and execute</p> 
     <pre>tar xzf <FILENAME>.tar.gz</pre> or <pre>tar xJf <FILENAME>.tar.xz</pre>
     <p>
     as documented on tar's man page. 
@@ -2452,28 +2466,6 @@
 
     <hr>
 
-    <a id="ModemKeepsCrashing"></a>
-    <h3><a class="anchor" href="#ModemKeepsCrashing">My cable/DSL modem 
-    keeps crashing. What's going on?</h3></a>
-
-    <p>
-    Tor relays hold many connections open at once. This is more intensive 
-    use than your cable modem (or other home router) would ever get normally. 
-    So if there are any bugs or instabilities, they might show up now. 
-    </p>
-    <p>
-    If your router keeps crashing, you've got two options. First, you should 
-    try to upgrade its firmware. If you need tips on how to do this, ask 
-    Google or your cable/router provider, or try the Tor IRC channel. 
-    </p>
-
-    <p>
-    Usually the firmware upgrade will fix it. If it doesn't, you will 
-    probably want to get a new (better) router. 
-    </p>
-
-    <hr>
-
     <a id="PortscannedMore"></a>
     <h3><a class="anchor" href="#PortscannedMore">Why do I get portscanned 
     more often when I run a Tor relay?</a></h3>
@@ -2797,7 +2789,7 @@
     <hr>
 
     <a id="BestOSForRelay"></a>
-    <h3><a class="anchor" href="#BestOSForRelay">Why doesn't my Windows (or other OS) Tor relay run well?</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