[or-cvs] r8377: break the IE proxy settings into its own page, since torbutt (website/trunk/docs/en)

[arma@xxxxxxxx]

Author: arma
Date: 2006-09-12 23:55:31 -0400 (Tue, 12 Sep 2006)
New Revision: 8377

Added:
   website/trunk/docs/en/tor-doc-web.wml
Modified:
   website/trunk/docs/en/tor-doc-win32.wml
Log:
break the IE proxy settings into its own page, since torbutton
should be all you need.


Added: website/trunk/docs/en/tor-doc-web.wml
===================================================================
--- website/trunk/docs/en/tor-doc-web.wml	2006-09-12 19:00:55 UTC (rev 8376)
+++ website/trunk/docs/en/tor-doc-web.wml	2006-09-13 03:55:31 UTC (rev 8377)
@@ -0,0 +1,45 @@
+## translation metadata
+# Revision: $Revision: 8152 $
+
+#include "head.wmi" TITLE="Configuring your browser to use Tor"
+
+<div class="center">
+
+<div class="main-column">
+
+<h1>Configuring your browser to use <a href="<page index>">Tor</a></h1>
+<br />
+
+<p>If you're using Firefox (we recommend it), you don't need this page.
+Simply install the <a
+href="http://freehaven.net/~squires/torbutton/";>Torbutton
+plugin</a>, restart your Firefox, and you're all set.
+</p>
+
+<p>Otherwise, you need to manually configure your browser's proxy
+settings.
+In Mozilla and Firefox, this is in Edit|Preferences|Advanced|Proxies.
+In Opera 7.5x it's Tools|Preferences|Network|Proxy servers.
+In IE, it's Tools|Internet Options|Connections|LAN Settings|Check Proxy Server|Advanced.</p>
+
+<img alt="Proxy settings in Firefox"
+src="../img/screenshot-win32-firefox-proxies.jpg" />
+
+<p>
+You should fill in "localhost"
+and "8118" to point the top four protocols to Privoxy, as shown here. (Even
+though Privoxy doesn't support FTP and Gopher, <a
+href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#FtpProxy";>you
+should set them up anyway</a>.) You should also fill out the socks              proxy entry to point directly to Tor ("localhost", "9050", and socks5)
+to cover protocols besides the first four. Then click "OK".</p>
+
+<hr />
+
+<p>If you have suggestions for improving this document, please <a
+href="<page contact>">send them to us</a>. Thanks!</p>
+
+  </div><!-- #main -->
+</div>
+
+#include <foot.wmi>
+

Modified: website/trunk/docs/en/tor-doc-win32.wml
===================================================================
--- website/trunk/docs/en/tor-doc-win32.wml	2006-09-12 19:00:55 UTC (rev 8376)
+++ website/trunk/docs/en/tor-doc-win32.wml	2006-09-13 03:55:31 UTC (rev 8377)
@@ -68,30 +68,18 @@
 <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 the <a
+<p>If you're using Firefox (we recommend it), simply install the <a
 href="http://freehaven.net/~squires/torbutton/";>Torbutton
-plugin</a> that sets everything up for you. If you plan to run Firefox
-on a different computer than Tor, read our <a
-href="<page docs/tor-switchproxy>">Tor SwitchProxy howto</a> to set up
-a plugin that makes it easy to switch between using Tor and using a
-direct connection.</p>
+plugin</a>, restart your Firefox, and you're all set.
+</p>
 
-<p>Otherwise, you need to manually configure your browser's proxy
-settings.
-In Mozilla and Firefox, this is in Edit|Preferences|Advanced|Proxies.
-In Opera 7.5x it's Tools|Preferences|Network|Proxy servers.
-In IE, it's Tools|Internet Options|Connections|LAN Settings|Check Proxy Server|Advanced.</p>
-
-<img alt="Proxy settings in Firefox"
-src="../img/screenshot-win32-firefox-proxies.jpg" />
-
 <p>
-You should fill in "localhost"
-and "8118" to point the top four protocols to Privoxy, as shown here. (Even
-though Privoxy doesn't support FTP and Gopher, <a
-href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#FtpProxy";>you
-should set them up anyway</a>.) You should also fill out the socks              proxy entry to point directly to Tor ("localhost", "9050", and socks5)
-to cover protocols besides the first four. Then click "OK".</p>
+(If you plan to run Firefox on a different computer than Tor, see the <a
+href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress";>FAQ
+entry for running Tor on a different computer</a>. If you need to
+use a browser other than Firefox, you'll have to <a href="<page
+docs/tor-doc-web>">configure its proxy settings yourself</a>.)
+</p>
 
 <p>Using Privoxy is <strong>necessary</strong> because <a
 href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS";>browsers