[or-cvs] r8379: link the torbutton screenshot and tor-doc-web from more plac (website/trunk/docs/en)

Wed Sep 13 05:26:24 UTC 2006

Author: arma
Date: 2006-09-13 01:26:23 -0400 (Wed, 13 Sep 2006)
New Revision: 8379

Modified:
   website/trunk/docs/en/tor-doc-osx.wml
   website/trunk/docs/en/tor-doc-unix.wml
   website/trunk/docs/en/tor-doc-win32.wml
Log:
link the torbutton screenshot and tor-doc-web from more places


Modified: website/trunk/docs/en/tor-doc-osx.wml
===================================================================

--- website/trunk/docs/en/tor-doc-osx.wml	2006-09-13 05:24:44 UTC (rev 8378)
+++ website/trunk/docs/en/tor-doc-osx.wml	2006-09-13 05:26:23 UTC (rev 8379)
@@ -68,16 +68,23 @@
 <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>
 
-<h3>Mozilla Firefox</h3>
+<img alt="Torbutton plugin for Firefox"
+src="../img/screenshot-torbutton.png"
+border="1">
 
+<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>Otherwise, you need to manually configure your browser's proxy
 settings.  In Firefox, this is in the Firefox | Preferences menu item,
 and then click Connection Settings... in the General tab.</p>

Modified: website/trunk/docs/en/tor-doc-unix.wml
===================================================================
--- website/trunk/docs/en/tor-doc-unix.wml	2006-09-13 05:24:44 UTC (rev 8378)
+++ website/trunk/docs/en/tor-doc-unix.wml	2006-09-13 05:26:23 UTC (rev 8379)
@@ -85,26 +85,23 @@
 <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, this is in Edit|Preferences|Advanced|Proxies.
-In Opera 7.5x it's Tools|Preferences|Network|Proxy servers.</p>
+<img alt="Torbutton plugin for Firefox"
+src="../img/screenshot-torbutton.png"
+border="1">
 
 <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

Modified: website/trunk/docs/en/tor-doc-win32.wml
===================================================================
--- website/trunk/docs/en/tor-doc-win32.wml	2006-09-13 05:24:44 UTC (rev 8378)
+++ website/trunk/docs/en/tor-doc-win32.wml	2006-09-13 05:26:23 UTC (rev 8379)
@@ -70,9 +70,13 @@
 
 <p>If you're using Firefox (we recommend it), simply install the <a
 href="http://freehaven.net/~squires/torbutton/">Torbutton
-plugin</a>, restart your Firefox, and you're all set.
+plugin</a>, restart your Firefox, and you're all set:
 </p>
 
+<img alt="Torbutton plugin for Firefox"
+src="../img/screenshot-torbutton.png"
+border="1">
+
 <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

