overhaul the docs for win32, os x, and switchproxy

svn:r4612

1 files changed, 66 insertions, 42 deletions

diff --git a/doc/tor-doc-osx.html b/doc/tor-doc-osx.html
index de4262c1a..868b85f7b 100644
--- a/doc/tor-doc-osx.html
+++ b/doc/tor-doc-osx.html
@@ -67,26 +67,36 @@ configuration for Tor has been installed as part of the installer package.
 <a name="using"></a>
 <h2>Step Two: Configure your applications to use Tor</h2>
 
-<p>After installing Tor, you need to configure your applications to use
-it. The first step is to set up web browsing.
-Change your browser to HTTP proxy at localhost port 8118.
+<p>After installing Tor and Privoxy, you need to configure your
+applications to use them. The first step is to set up web browsing.</p>
+
+<p>If you're using Firefox (we recommend it), check out our <a
+href="tor-switchproxy.html">Tor SwitchProxy howto</a> to set up
+a plugin that makes it easy to switch between using Tor and using a
+direct connection.</p>
+
+<p>Otherwise, you need to manually configure your browser to HTTP proxy
+at localhost port 8118.
 (That's where Privoxy listens.)
 In Mozilla, this is in Mozilla|Preferences|Advanced|Proxies.
-In Firefox it's Firefox|Preferences|General|ConnectionSettings.
 You should set both your Web Proxy (HTTP) and your Secure Web Proxy
 (HTTPS or SSL) to localhost port 8118, to hide your SSL traffic too.
+You should consider configuring your "FTP Proxy" too; see <a
+href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#FtpProxy">this
+note</a> about Tor and ftp proxies.
+</p>
 
 <p>If you want to use Tor with Safari, you need to change your
 Network Settings. The process looks something like:</p>
 
-<img alt="LAN settings in IE"
+<img alt="Network settings"
 src="http://tor.eff.org/img/screenshot-osx-choose-network.png"
 border="1">
 
 <p>
 Select your Network Preferences from the Apple | Location menu.</p>
 
-<img alt="Proxy settings in IE"
+<img alt="Network preferences"
 src="http://tor.eff.org/img/screenshot-osx-choose-interface.png"
 border="1">
 <P>
@@ -95,12 +105,16 @@ border="1">
 more than one Interface you must change the proxy settings for each
 individually.</p>
 
-<img alt="Proxy settings in IE"
+<img alt="Proxy settings"
 src="http://tor.eff.org/img/screenshot-osx-proxy-settings.png"
 border="1">
 
-<p>Select and enter 127.0.0.1 and port 8118 for both Web Proxy (HTTP)
-and your Secure Web Proxy (HTTPS).  Leave your Use Passive FTP Mode (PASV) setting as is.</p>
+<p>Select and enter 127.0.0.1 and port 8118 for both
+Web Proxy (HTTP) and your Secure Web Proxy (HTTPS).
+You should consider clicking on "FTP Proxy" too; see <a
+href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#FtpProxy">this
+note</a> about Tor and ftp proxies. Leave your Use Passive FTP Mode
+(PASV) setting as is.</p>
 
 <p>Using privoxy is <strong>necessary</strong> because <a
 href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS">browsers
@@ -109,48 +123,51 @@ DNS requests when they use a SOCKS proxy directly</a>, which is bad for
 your anonymity. Privoxy also removes certain dangerous headers from your
 web requests, and blocks obnoxious ad sites like Doubleclick.</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.
-Your local IP address is shown by the <tt>ifconfig</tt> command.
-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.
-If everything works, your IP address should have changed.
+<p>To Torify other applications that support HTTP proxies, just
+point them at Privoxy (that is, localhost port 8118). To use SOCKS
+directly (for instant messaging, Jabber, IRC, etc), you can point
+your application directly at Tor (localhost port 9050), but see <a
+href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS">this
+FAQ entry</a> for why this may be dangerous. For applications
+that support neither SOCKS nor HTTP, take a look at <a
+href="http://www.taiyo.co.jp/~gotoh/ssh/connect.html">connect</a> or
+<a href="http://www.dest-unreach.org/socat/">socat</a>.</p>
+
+<p>For information on how to Torify other applications, check out the
+<a href="http://wiki.noreply.org/wiki/TheOnionRouter/TorifyHOWTO">Torify
+HOWTO</a>.
 </p>
 
+<a name="verify"></a>
+<h2>Step Three: Make sure it's working</h2>
+
 <p>
-<!--<a href="http://peertech.org/privacy-knoppix/">peertech</a>, -->
 <a href="http://ipid.shat.net">ipid.shat.net</a> and
 <a href="http://www.showmyip.com/">showmyip.com</a>
-are sites that show your current IP so you can see
-what address and country you're coming from.
+are sites that show what IP address and country you appear to be coming
+from.
 </p>
 
-<p>
-If you have a personal firewall that limits your computer's ability
-to connect to itself, be sure to allow connections from your local
-applications to
-local port 8118 and port 9050. If your firewall blocks outgoing connections,
-punch a hole so it can connect to at least TCP ports 80, 443, and 9001-9033.
-For more troubleshooting suggestions, see <a
-href="http://wiki.noreply.org/wiki/TheOnionRouter/TorFAQ">the FAQ</a>.
+<p>If you don't know your current public IP address, this may not be a
+very useful test. To learn your IP address, run <tt>ifconfig</tt>.
+If you are behind a NAT or firewall, though, you won't be able
+to learn your public IP address. In this case, you should 1) configure
+your browser to connect directly (that is, stop using Privoxy), 2) check
+your IP address with one of the sites above, 3) point your browser back
+to Privoxy, and 4) see whether your IP address has changed.
 </p>
 
-<p>To Torify another application that supports HTTP, just point
-it at Privoxy (that is, localhost port 8118). To use SOCKS
-directly (for example, for instant messaging, Jabber, IRC, etc),
-point your application directly at Tor (localhost port 9050). For
-applications that support neither SOCKS nor HTTP, take a look at <a
-href="http://www.taiyo.co.jp/~gotoh/ssh/connect.html">connect</a> or
-<a href="http://www.dest-unreach.org/socat/">socat</a>.
-<br />
-For more information how to Torify other applications in detail visit
-the <a href="http://wiki.noreply.org/wiki/TheOnionRouter/TorifyHOWTO">Torify HOWTO</a>.
-<p>If you have suggestions for improving this document, please post
-them on <a href="http://bugs.noreply.org/tor">our bugtracker</a> in the
-website category. Thanks!</p>
+<p> If you have a personal firewall that limits your computer's
+ability to connect to itself, be sure to allow connections from
+your local applications to local port 8118 and port 9050. If
+your firewall blocks outgoing connections, punch a hole so
+it can connect to at least TCP ports 80 and 443, and then see <a
+href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#FirewalledClient">this
+FAQ entry</a>.
+</p>
 
-<h2>How To Uninstall</h2>
+<a name="uninstall"></a>
+<h2>How To Uninstall Tor and Privoxy</h2>
 
 <p>The Tor 0.1.0.x series does not come with an uninstaller; this feature
   will be added in the 0.1.1.x series.  If you want to remove Tor on OSX,
@@ -166,7 +183,8 @@ website category. Thanks!</p>
 
 <p>To erase all remaining Tor and Privoxy files from your computer, delete
   the following:
-   <ul><li>/Library/Tor</li>
+   <ul>
+   <li>/Library/Tor</li>
    <li>/Library/Privoxy</li>
    <li>/usr/bin/tor</li>
    <li>/usr/bin/tor_resolve</li>
@@ -177,6 +195,12 @@ website category. Thanks!</p>
   </ul>
 </p>
 
+<hr />
+
+<p>If you have suggestions for improving this document, please post
+them on <a href="http://bugs.noreply.org/tor">our bugtracker</a> in the
+website category. Thanks!</p>
+
 <p>$Id$</p>
 
 </body>