[or-cvs] r19831: {website} we really do want contact info; and point to the new relayor (website/trunk/docs/en)

[arma at seul.org]

Author: arma
Date: 2009-06-25 00:10:49 -0400 (Thu, 25 Jun 2009)
New Revision: 19831

Modified:
   website/trunk/docs/en/tor-doc-relay.wml
Log:
we really do want contact info; and point to the new relayorbridge
faq entry.


Modified: website/trunk/docs/en/tor-doc-relay.wml
===================================================================
--- website/trunk/docs/en/tor-doc-relay.wml	2009-06-25 04:07:40 UTC (rev 19830)
+++ website/trunk/docs/en/tor-doc-relay.wml	2009-06-25 04:10:49 UTC (rev 19831)
@@ -85,12 +85,14 @@
 <li>Click <tt>Setup Relaying</tt>.</li>
 <li>Choose <tt>Relay Traffic for the Tor network</tt> if you want to be
 a public relay (recommended), or choose <tt>Help censored users reach the
-Tor network</tt> if you want to be a <a href="<page bridges>">bridge</a>
+Tor network</tt> if you want to be a <a href="<page
+faq>#RelayOrBridge">bridge</a>
 for users in countries that censor their Internet.</li>
-<li>Enter a nickname for your relay. (Optional, enter contact information.)</li>
+<li>Enter a nickname for your relay, and enter contact information in
+case we need to contact you about problems.</li>
 <li>Leave <tt>Attempt to automatically configure port forwarding</tt> clicked.
 Push the <tt>Test</tt> button to see if it works.  If it does work, great.
-If not, see number 4 below.</li>
+If not, see number 3 below.</li>
 <li>Choose the <tt>Bandwidth Limits</tt> tab.  Select how much bandwidth you want to provide for Tor users like yourself.</li>
 <li>Choose the <tt>Exit Policies</tt> tab.  If you want to allow others
 to use your relay for these services, don't change anything.  Un-check
@@ -106,12 +108,12 @@
 <ul>
 <li>Edit the bottom part of <a
 href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc">your
-torrc file</a>. Make sure to define ORPort and <a href="<page
-faq>#ExitPolicies">look at ExitPolicy</a>
-if you want to be a public relay (recommended), or just add
-<a href="<page bridges>#RunningABridge">these lines</a>
-if you want to be a <a href="<page bridges>">bridge</a>
-for users in countries that censor their Internet.
+torrc file</a>. If you want to be a public relay (recommended),
+make sure to define ORPort and <a href="<page
+faq>#ExitPolicies">look at ExitPolicy</a>; otherwise
+if you want to be a <a href="<page faq>#RelayOrBridge">bridge</a>
+for users in countries that censor their Internet,
+just use <a href="<page bridges>#RunningABridge">these lines</a>.
 <!-- If you installed from source, create the DataDirectory if necessary
 and make sure it's owned by the user that will be running tor. -->
 </li>
@@ -123,7 +125,7 @@
 (ORPort, plus DirPort if you enabled it). If you have a
 hardware firewall (Linksys box, cablemodem, etc) you might like <a
 href="http://portforward.com/">portforward.com</a>. Also, make sure you
-allow all <em>outgoing</em> connections, so your relay can reach the
+allow all <em>outgoing</em> connections too, so your relay can reach the
 other Tor relays.
 </li>