clean up osx/win32/generic instructions

svn:r3309

doc/tor-doc-osx.html

@@ -71,16 +71,14 @@ configuration for Tor has been installed as part of the installer package.
 <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.
-(That's where Privoxy listens.) For Safari you need to change your
+(That's where Privoxy listens.)
-Network Settings. Other web browers allow you to change proxy settings
+In Mozilla, this is in Mozilla|Preferences|Advanced|Proxies.
-individually.</p>
+In Firefox it's Firefox|Preferences|General|ConnectionSettings.
-
+You should set both your Web Proxy (HTTP) and your Secure Web Proxy
-<p>In Mozilla, this is in Mozilla|Preferences|Advanced|Proxies.
+(HTTPS or SSL) to localhost port 8118, to hide your SSL traffic too.
-In Firefox it's Firefox|Preferences|General|ConnectionSettings</p>
 
-<P>You should set both your Web Proxy (HTTP) and your Secure Web Proxy
+<p>If you want to use Tor with Safari, you need to change your
-(HTTPS) to the same thing, to hide your SSL traffic. For Safari, this
+Network Settings. The process looks something like:</p>
-looks something like:</p>
 
 <img alt="LAN settings in IE"
 src="http://tor.eff.org/img/screenshot-osx-choose-network.png"
@@ -118,9 +116,11 @@ what IP it says you're coming from. (If it's down, you can try the
 site instead.)</p>
 
 <p>
-If you have a personal firewall, be sure to allow local connections to
+If you have a personal firewall that limits your computer's ability
-port 8118 and port 9050. If your firewall blocks outgoing connections,
+to connect to itself, be sure to allow connections from your local
-punch a hole so it can connect to TCP ports 80, 443, and 9001-9033.
+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>

doc/tor-doc-win32.html

@@ -91,7 +91,7 @@ src="http://tor.eff.org/img/screenshot-win32-privoxy-edit.jpg" />
 In Mozilla, this is in Edit|Preferences|Advanced|Proxies. In IE, it's
 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. In IE, this looks something like:</p>
+thing, to hide your SSL traffic too. In IE, this looks something like:</p>
 
 <img alt="LAN settings in IE"
 src="http://tor.eff.org/img/screenshot-win32-ie-lan.jpg" />
@@ -111,9 +111,11 @@ what IP it says you're coming from. (If it's down, you can try the
 site instead.)</p>
 
 <p>
-If you have a personal firewall, be sure to allow local connections to
+If you have a personal firewall that limits your computer's ability
-port 8118 and port 9050. If your firewall blocks outgoing connections,
+to connect to itself, be sure to allow connections from your local
-punch a hole so it can connect to TCP ports 80, 443, and 9001-9033.
+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>

doc/tor-doc.html

@@ -202,9 +202,11 @@ what IP it says you're coming from. (If it's down, you can try the
 site instead.)</p>
 
 <p>
-If you have a personal firewall, be sure to allow local connections to
+If you have a personal firewall that limits your computer's ability
-port 8118 and port 9050. If your firewall blocks outgoing connections,
+to connect to itself, be sure to allow connections from your local
-punch a hole so it can connect to TCP ports 80, 443, and 9001-9033.
+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.
 <!--If you're
 using Safari as your browser, keep in mind that OS X before 10.3 claims
 to support SOCKS but does not. -->