Mozilla/Firefox instructions present in both win32 and osx. Added network-tools.com as a IP-test site.

svn:r3768

doc/tor-doc-osx.html

@@ -114,10 +114,11 @@ 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, go to <a
-href="http://peertech.org/privacy-knoppix/">this site</a> and see
+href="http://peertech.org/privacy-knoppix/">peertech</a>, 
-what IP it says you're coming from. (If it's down, you can try the
+<a href="http://www.junkbusters.com/cgi-bin/privacy">junkbusters</a> or
-<a href="http://www.junkbusters.com/cgi-bin/privacy">junkbusters</a>
+<a href="http://www.network-tools.com">network-tools</a>
-site instead.)</p>
+and see what IP it says you're coming from. 
+</p>
 
 <p>
 If you have a personal firewall that limits your computer's ability
@@ -135,9 +136,10 @@ 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>.  Let us know if
+<a href="http://www.dest-unreach.org/socat/">socat</a>.  
-you get them working so we can add better instructions here.</p>
+<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>

doc/tor-doc-win32.html

@@ -92,6 +92,7 @@ src="http://tor.eff.org/img/screenshot-win32-privoxy-edit.jpg" />
 
 <p>Then change your browser to HTTP proxy at localhost port 8118.
 (That's where Privoxy listens.)
+In Firefox it's Firefox|Preferences|General|ConnectionSettings.
 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
@@ -109,11 +110,11 @@ 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, go to <a
-href="http://peertech.org/privacy-knoppix/">this site</a> and see
+href="http://peertech.org/privacy-knoppix/">peertech</a>,
-what IP it says you're coming from. (If it's down, you can try the
+<a href="http://www.junkbusters.com/cgi-bin/privacy">junkbusters</a> or
-<a href="http://www.junkbusters.com/cgi-bin/privacy">junkbusters</a>
+<a href="http://www.network-tools.com">network-tools</a>
-site instead.)</p>
+and see what IP it says you're 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
@@ -133,10 +134,9 @@ href="http://www.socks.permeo.com/Download/SocksCapDownload/index.asp">SocksCap<
 <a href="http://www.freecap.ru/eng/">FreeCap</a>,
 or the <a
 href="http://www.hummingbird.com/products/nc/socks/index.html?cks=y">Hummingbird</a>
-SOCKS client. (FreeCap is free software; the others are proprietary.)
+SOCKS client. (FreeCap is free software; the others are proprietary.)<br />
-Let us know if you get them working so we can add better
+For more information how to Torify other applications in detail visit
-instructions here.</p>
+the <a href="http://wiki.noreply.org/wiki/TheOnionRouter/TorifyHOWTO">Torify HOWTO</a>.
-
 <p>If you have suggestions for improving this document, please <a
 href="mailto:tor-bugs@freehaven.net">send them to us</a>. Thanks!</p>
 

doc/tor-doc.html

@@ -156,9 +156,8 @@ server <a href="#server">below</a>.</p>
 <p>Win32 users can use our Tor installer. See <a
 href="tor-doc-win32.html">these instructions</a> for help with
 installing, configuring, and using Tor on Win32.
-</p>
+<br />
-
+Mac OS X users can use our Tor installer. See <a
-<p>Mac OS X users can use our Tor installer. See <a
 href="tor-doc-osx.html">these instructions</a> for help with
 installing, configuring, and using Tor on Mac OS X.
 </p>
@@ -201,10 +200,11 @@ DNS requests when it uses a SOCKS proxy directly</a>. Privoxy also gives
 you good html scrubbing.</p>
 
 <p>To test if it's working, go to <a
-href="http://peertech.org/privacy-knoppix/">this site</a> and see
+href="http://peertech.org/privacy-knoppix/">peertech</a>,
-what IP it says you're coming from. (If it's down, you can try the
+<a href="http://www.junkbusters.com/cgi-bin/privacy">junkbusters</a> or
-<a href="http://www.junkbusters.com/cgi-bin/privacy">junkbusters</a>
+<a href="http://www.network-tools.com">network-tools</a>
-site instead.)</p>
+and see what IP it says you're coming from.
+</p>
 
 <p>
 If you have a personal firewall that limits your computer's ability