[or-cvs] r17861: {website} Move the abuse section from the wiki to the website (website/trunk/en)

[sebastian at seul.org]

Author: sebastian
Date: 2009-01-03 13:15:36 -0500 (Sat, 03 Jan 2009)
New Revision: 17861

Modified:
   website/trunk/en/faq.wml
Log:
Move the abuse section from the wiki to the website

Modified: website/trunk/en/faq.wml
===================================================================
--- website/trunk/en/faq.wml	2009-01-03 18:15:28 UTC (rev 17860)
+++ website/trunk/en/faq.wml	2009-01-03 18:15:36 UTC (rev 17861)
@@ -53,6 +53,13 @@
 <li><a href="#KeyManagement">Tell me about all the keys Tor uses.</a></li>
 </ul>
 
+<p>Abuse</p>
+<ul>
+<li><a href="#Criminals">Doesn't Tor enable criminals to do bad things?</a></li>
+<li><a href="#RespondISP">How do I respond to my ISP about my exit
+relay?</a></li>
+</ul>
+
 <p>For other questions not yet on this version of the FAQ, see the <a
 href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ">wiki
 FAQ</a> for now.</p>
@@ -696,6 +703,29 @@
 
 <hr />
 
+<a id="Criminals"></a>
+<h3><a class="anchor" href="#Criminals">Doesn't Tor enable criminals to do bad
+things?</a></h3>
+
+<p>
+For the answer to this question and others, please see our new <a
+href="https://www.torproject.org/faq-abuse.html">Tor Abuse FAQ</a>.
+</p>
+
+<hr />
+
+<a id="RespondISP"></a>
+<h3><a class="anchor" href="#RespondISP">How do I respond to my ISP about my
+exit relay?</a></h3>
+
+<p>
+A collection of templates for successfully responding to ISPs is <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorAbuseTemplates">collected
+here</a>.
+</p>
+
+<hr />
+
   </div><!-- #main -->
 
 #include <foot.wmi>