[tor-commits] r25291: {website} fix ticket 4861 with an updated screenshot and directions. (in website/trunk: docs/en images)

[Andrew Lewman]

Author: phobos
Date: 2012-01-07 18:09:02 +0000 (Sat, 07 Jan 2012)
New Revision: 25291

Modified:
   website/trunk/docs/en/tor-doc-web.wml
   website/trunk/images/screenshot-win32-firefox-proxies.jpg
Log:
fix ticket 4861 with an updated screenshot and directions.


Modified: website/trunk/docs/en/tor-doc-web.wml
===================================================================
--- website/trunk/docs/en/tor-doc-web.wml	2012-01-07 14:23:42 UTC (rev 25290)
+++ website/trunk/docs/en/tor-doc-web.wml	2012-01-07 18:09:02 UTC (rev 25291)
@@ -13,15 +13,10 @@
     <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="<page torbutton/index>">Torbutton
-    plugin</a>, restart your Firefox, and you're all set:
-    </p>
-    
-    <img alt="Torbutton plugin for Firefox"
-    src="$(IMGROOT)/screenshot-torbutton.png" />
-    
+    <p>We strongly encourage you to use the <a href="<page
+    projects/torbrowser>">TorBrowser Bundle</a> instead of configuring
+    your own browser for usage with Tor.</p>
+
     <br>
     
     <p>Otherwise, you need to manually configure your browser's proxy
@@ -36,13 +31,8 @@
     <img alt="Proxy settings in Firefox"
     src="$(IMGROOT)/screenshot-win32-firefox-proxies.jpg">
     
-    <p>
-    You should fill in "localhost"
-    and "8118" to point the top four protocols to Polipo, as shown here. (Even
-    though Polipo doesn't support FTP and Gopher, <a
-    href="<wikifaq>#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>
+    <p>You should fill in "127.0.0.1" and "9050" to point the SOCKS
+    protocol, as shown here. Then click "OK".</p>
     
     <hr>
     

Modified: website/trunk/images/screenshot-win32-firefox-proxies.jpg
===================================================================
(Binary files differ)