[or-cvs] r20905: {website} remove privoxy from the windows instructions, since we ship (website/trunk/docs/en)

[phobos at seul.org]

Author: phobos
Date: 2009-11-03 16:00:25 -0500 (Tue, 03 Nov 2009)
New Revision: 20905

Modified:
   website/trunk/docs/en/tor-doc-windows.wml
Log:
remove privoxy from the windows instructions, since we ship polipo now.


Modified: website/trunk/docs/en/tor-doc-windows.wml
===================================================================
--- website/trunk/docs/en/tor-doc-windows.wml	2009-11-03 13:52:38 UTC (rev 20904)
+++ website/trunk/docs/en/tor-doc-windows.wml	2009-11-03 21:00:25 UTC (rev 20905)
@@ -13,7 +13,7 @@
 
 <p>
 <b>Note that these are the installation instructions for running a Tor
-client on MS Windows (98, 98SE, NT4, 2000, XP, Vista, Server).
+client on Microsoft Windows (2000, XP, Vista, 7, and Server Editions).
 If you want to relay traffic for others to help the network grow (please
 do), read the <a href="<page docs/tor-doc-relay>">Configuring a relay</a>
 guide.</b>
@@ -26,9 +26,10 @@
 
 <p>
 The install for MS Windows bundles <a href="<page index>">Tor</a>,
-<a href="<page vidalia/index>">Vidalia</a> (a GUI for Tor), and <a
-href="http://www.privoxy.org">Privoxy</a> (a filtering web proxy) into
-one package, with the three applications pre-configured to work together.
+<a href="<page vidalia/index>">Vidalia</a> (a GUI for Tor), Torbutton (a
+plugin for Mozilla Firefox), and <a
+href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a> (a web proxy) into
+one package, with the four applications pre-configured to work together.
 Download either the <a href="../<package-win32-bundle-stable>">stable</a>
 or the <a href="../<package-win32-bundle-alpha>">experimental</a>
 version of the Windows bundle, or look for more options on the
@@ -38,7 +39,7 @@
 <img alt="tor installer splash page"
 src="../img/screenshot-win32-installer-splash.png" />
 
-<p>If you have previously installed Tor, Vidalia, or Privoxy
+<p>If you have previously installed Tor, Vidalia, or Polipo
 you can deselect whichever components you do not need to install
 in the dialog shown below.
 </p>
@@ -62,7 +63,7 @@
 <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>
 <br />
 
-<p>After installing Tor and Privoxy, you need to configure your
+<p>After installing Tor and Polipo, you need to configure your
 applications to use them. The first step is to set up web browsing.</p>
 
 <p>You should use Tor with Firefox and Torbutton, for best safety. The
@@ -84,7 +85,7 @@
 </p>
 
 <p>To Torify other applications that support HTTP proxies, just
-point them at Privoxy (that is, localhost port 8118). To use SOCKS
+point them at Polipo (that is, localhost port 8118). To use SOCKS
 directly (for instant messaging, Jabber, IRC, etc), you can point
 your application directly at Tor (localhost port 9050), but see <a
 href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS">this
@@ -104,10 +105,9 @@
 <br />
 
 <p>
-Check to see that Privoxy and Vidalia are running. Privoxy's icon is
-a blue or green circle with a "P" in it, and Vidalia uses a small
-green onion to indicate Tor is running or a dark onion with a red "X"
-when Tor is not running. You can start or stop Tor by right-clicking
+Check to see that Vidalia is running.  Vidalia uses a small green onion
+to indicate Tor is running or a dark onion with a red "X" when Tor is
+not running. You can start or stop Tor by right-clicking
 on Vidalia's icon in your system tray and selecting "Start" or "Stop"
 from the menu as shown below:
 </p>
@@ -121,8 +121,6 @@
 <a href="https://check.torproject.org/">the
 Tor detector</a>
 and see whether it thinks you're using Tor or not.
-#<a href="http://ipchicken.com/">this site</a>
-#to see what IP address it thinks you're using.
 (If that site is down, see <a
 href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate">this
 FAQ entry</a> for more suggestions on how to test your Tor.)