[or-cvs] r19809: {website} merge the old faq-abuse exitpolicies entry (website/trunk/en)

[arma at seul.org]

Author: arma
Date: 2009-06-24 01:01:31 -0400 (Wed, 24 Jun 2009)
New Revision: 19809

Modified:
   website/trunk/en/faq-abuse.wml
   website/trunk/en/faq.wml
Log:
merge the old faq-abuse exitpolicies entry


Modified: website/trunk/en/faq-abuse.wml
===================================================================
--- website/trunk/en/faq-abuse.wml	2009-06-24 04:44:15 UTC (rev 19808)
+++ website/trunk/en/faq-abuse.wml	2009-06-24 05:01:31 UTC (rev 19809)
@@ -16,7 +16,6 @@
 <li><a href="<page faq-abuse>#WhatAboutCriminals">Doesn't Tor enable criminals to do bad things?</a></li>
 <li><a href="<page faq-abuse>#DDoS">What about distributed denial of service attacks?</a></li>
 <li><a href="<page faq-abuse>#WhatAboutSpammers">What about spammers?</a></li>
-<li><a href="<page faq-abuse>#ExitPolicies">How do Tor exit policies work?</a></li>
 <li><a href="<page faq-abuse>#HowMuchAbuse">Does Tor get much abuse?</a></li>
 <li><a href="<page faq-abuse>#TypicalAbuses">So what should I expect if I run an exit relay?</a></li>
 <li><a href="<page faq-abuse>#IrcBans">Tor is banned from the IRC network I want to use.</a></li>
@@ -110,16 +109,10 @@
 <a id="ExitPolicies"></a>
 <h3><a class="anchor" href="#ExitPolicies">How do Tor exit policies work?</a></h3>
 
-<p>Each Tor relay has an exit policy that specifies what sort of
-outbound connections are allowed or refused from that relay. The exit
-policies are propagated to the client via the directory, so clients
-will automatically avoid picking exit nodes that would refuse to exit
-to their intended destination. </p>
+<p>
+<a href="<page faq>#RunARelayBut">Moved to the new FAQ page</a>
+</p>
 
-<p>This way each relay can decide the services, hosts, and networks
-he wants to allow connections to, based on abuse potential and his own
-situation. </p>
-
 <a id="HowMuchAbuse"></a>
 <h3><a class="anchor" href="#HowMuchAbuse">Does Tor get much abuse?</a></h3>
 
@@ -298,7 +291,7 @@
 not so different from AOL in this respect.</p>
 
 <p>Lastly, please remember that Tor relays have <a
-href="#ExitPolicies">individual exit policies</a>. Many Tor relays do
+href="#RunARelayBut">individual exit policies</a>. Many Tor relays do
 not allow exiting connections at all. Many of those that do allow some
 exit connections might already disallow connections to
 your service. When you go about banning nodes, you should parse the

Modified: website/trunk/en/faq.wml
===================================================================
--- website/trunk/en/faq.wml	2009-06-24 04:44:15 UTC (rev 19808)
+++ website/trunk/en/faq.wml	2009-06-24 05:01:31 UTC (rev 19809)
@@ -719,8 +719,7 @@
 feature</a>.
 </li>
 <li>Each Tor relay has an <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RunARelayBut">ex
-it
+href="#RunARelayBut">exit
 policy</a> that specifies what sort of outbound connections are allowed
 or refused from that relay. If you are uncomfortable allowing people
 to exit from your relay, you can set it up to only allow connections
@@ -759,10 +758,12 @@
 
 <p>
 Each Tor relay has an exit policy that specifies what sort of outbound
-connections he will allow from his relay, and what sort he will
-refuse. The exit policies are propagated to the client in the directory,
-so clients will avoid picking exit nodes that would refuse to exit to
-their intended destination.
+connections are allowed or refused from that relay. The exit policies are
+propagated to the client via the directory, so clients will automatically
+avoid picking exit relays that would refuse to exit to their intended
+destination. This way each relay can decide the services, hosts, and
+networks he wants to allow connections to, based on abuse potential and
+his own situation.
 </p>
 
 <p>