change explanation of registering your server

svn:r4401

1 files changed, 12 insertions, 14 deletions

diff --git a/doc/tor-doc.html b/doc/tor-doc.html
index cf3c91a6b..542298bc0 100644
--- a/doc/tor-doc.html
+++ b/doc/tor-doc.html
@@ -139,7 +139,7 @@ server itself knows its IP. Have a look at this
 entry in the FAQ</a>.</li>
 <li>If your server is behind a NAT and it doesn't
 know its public IP (e.g. it has an IP of 192.168.x.y), you need to set
-up port forwarding.  Forwarding TCP connections is system dependent but 
+up port forwarding.  Forwarding TCP connections is system dependent but
 <a href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#ServerForFirewalledClients">
 this entry</a> offers some examples on how to do this.</li>
 <li>Your server will passively estimate and advertise its recent
@@ -196,8 +196,8 @@ you good html scrubbing.</p>
 
 <p>To test if it's working, you need to know your normal IP address so you can
 verify that the address really changes when running Tor.
-If you are using Linux or OS X your local IP address is shown by the <tt>ifconfig</tt> 
-command.  Under Windows go to the Start menu, click Run and enter <tt>cmd</tt>. 
+If you are using Linux or OS X your local IP address is shown by the <tt>ifconfig</tt>
+command.  Under Windows go to the Start menu, click Run and enter <tt>cmd</tt>.
 At the command prompt, enter <tt>ipconfig</tt>. If you are behind a NAT/Firewall
  you can use one of the sites listed below to check which IP you are using.
 When that is done, start Tor and Privoxy and visit any of the sites again.
@@ -206,9 +206,9 @@ If everything works, your IP address should have changed.
 
 <p>
 <!--<a href="http://peertech.org/privacy-knoppix/">peertech</a>, -->
-<a href="http://www.showmyip.com/">showmyip.com</a> and 
-<a href="http://ipid.shat.net">ipid.shat.net</a> 
-are sites that show your current IP so you can see 
+<a href="http://www.showmyip.com/">showmyip.com</a> and
+<a href="http://ipid.shat.net">ipid.shat.net</a>
+are sites that show your current IP so you can see
 what address and country you're coming from.
 </p>
 
@@ -256,7 +256,7 @@ href="#client-or-server">the section above</a>.
 </p>
 
 <p>To set up a Tor server, do the following steps after installing Tor.
-(These instructions are Unix-centric; but Tor 0.0.9.5 and later is running 
+(These instructions are Unix-centric; but Tor 0.0.9.5 and later is running
 as a server on Windows now as well.)
 </p>
 
@@ -288,8 +288,9 @@ initscripts or startup scripts. If it logs any warnings, address them. (By
 default Tor logs to stdout, but some packages log to <tt>/var/log/tor/</tt>
 instead. You can edit your torrc to configure log locations.)
 <li>4. <b>Register your server.</b>  Send mail to <a
-href="mailto:tor-ops@freehaven.net">tor-ops@freehaven.net</a> with the
-following information:
+href="mailto:tor-ops@freehaven.net">tor-ops@freehaven.net</a> with your
+server's nickname in the subject line and include the
+following information in the message:
 <ul>
 <li>Your server's nickname.</li>
 <li>The fingerprint for your server's key (the contents of the
@@ -300,11 +301,8 @@ and</li>
 <li>What kind of connectivity the new server will have.</li>
 </ul>
 If possible, sign your mail using PGP.<br />
-Registering your server improves the anonymity of the network quite a bit.
-If you don't register your server default users will only use you for the 
-middle hop of their circuits.  
-If you are running a registered middleman server, clients will be willing to 
-choose your node as an entry node as well as a middleman. 
+Registering your server reserves your nickname so nobody else can take it,
+and lets us contact you if you need to upgrade or something goes wrong.
 <li>5. Subscribe to the <a href="http://archives.seul.org/or/announce/">or-announce</a>
 mailing list. It is very low volume, and it will keep you informed
 of new stable releases. You might also consider subscribing to <a