rewrite 'configuring a client' section

svn:r3164

doc/tor-doc.html

@@ -169,6 +169,7 @@ you've got it running.</p>
 default configuration file, and most people won't need to change any of
 the settings.</p>
 
+<!--
 <p>The only setting you might need to change is "SocksBindAddress".
 By default, your Tor client only listens for applications that connect
 from localhost. Connections from other computers are refused. If you
@@ -176,32 +177,41 @@ want to torify applications on different computers than the Tor client,
 you should copy torrc.sample to torrc (it's installed by default
 to /usr/local/etc/tor/), change the SocksBindAddress line to
 0.0.0.0, and then hup or restart Tor.</p>
+-->
 
-<p>To test if it's working, point your browser
+<p>After installing Tor, you should install <a
-to socks4 or socks5 proxy at localhost port 9050. In
-Mozilla, this is in edit|preferences|advanced|proxies. Go to <a
-href="http://www.junkbusters.com/cgi-bin/privacy">http://www.junkbusters.com/cgi-bin/privacy</a>
-and see what IP it says you're coming from. (If you have a personal
-firewall, be sure to allow local connections to port 9050. If your
-firewall blocks outgoing connections, punch a hole so it can connect to
-TCP *:9001-9004 and *:9030-9033. If you're using Safari as your browser,
-keep in mind that OS X before 10.3 claims to support socks but does
-not.)</p>
-
-<p>Once you've tested that it works, you should install <a
 href="http://www.privoxy.org/">privoxy</a>, which is a filtering web
 proxy that integrates well with Tor. Add the line <br>
 <tt>forward-socks4a / localhost:9050 .</tt><br>
 (don't forget the dot) to privoxy's config file (you can just add it to the
-top). Then change your mozilla to http proxy at localhost port 8118
+top). Then change your browser to http proxy at localhost port 8118.
-(and no socks proxy). You should also set your SSL proxy to the same
+(In Mozilla, this is in Edit|Preferences|Advanced|Proxies. In IE, it's
-thing, to hide your https traffic. Using privoxy is necessary because
+Tools|Internet Options|Connections|LAN Settings|Advanced.)
+You should also set your SSL proxy (IE calls it "Secure") to the same
+thing, to hide your SSL traffic. Using privoxy is <b>necessary</b> because
 <a href="http://tor.freehaven.net/cvs/tor/doc/CLIENTS">Mozilla leaks your
 DNS requests when it uses a socks proxy directly</a>. Privoxy also gives
 you good html scrubbing.</p>
 
-<p>You might want to use Tor with an application that doesn't
+<p>To test if it's working, go to <a
-support socks or http directly. In this case, you should look at
+href="http://www.junkbusters.com/cgi-bin/privacy">http://www.junkbusters.com/cgi-bin/privacy</a>
+and see what IP it says you're coming from.
+</p>
+
+<p>
+If you have a personal firewall, be sure to allow local connections to
+port 8118 and port 9050. If your firewall blocks outgoing connections,
+punch a hole so it can connect to TCP ports 80, 443, and 9001-9033.
+<!--If you're
+using Safari as your browser, keep in mind that OS X before 10.3 claims
+to support socks but does not. -->
+For more troubleshooting suggestions, see <a
+href="http://wiki.noreply.org/wiki/TheOnionRouter/TorFAQ">the FAQ</a>.
+</p>
+
+<p>To Torify an application that supports http, just point it at
+Privoxy. To use socks directly, point it at localhost port 9050. For
+applications that support neither socks nor http, you should look at
 using <a href="http://tsocks.sourceforge.net/">tsocks</a>
 to dynamically replace the system calls in your program to
 route through Tor. If you want to use socks4a, consider using <a