remove privoxy from the windows instructions, since we ship polipo now.
Andrew Lewman

Andrew Lewman commited on 2009-11-03 22:00:25
Zeige 1 geänderte Dateien mit 11 Einfügungen und 13 Löschungen.

... ...
@@ -13,7 +13,7 @@
13 13
 
14 14
 <p>
15 15
 <b>Note that these are the installation instructions for running a Tor
16
-client on MS Windows (98, 98SE, NT4, 2000, XP, Vista, Server).
16
+client on Microsoft Windows (2000, XP, Vista, 7, and Server Editions).
17 17
 If you want to relay traffic for others to help the network grow (please
18 18
 do), read the <a href="<page docs/tor-doc-relay>">Configuring a relay</a>
19 19
 guide.</b>
... ...
@@ -26,9 +26,10 @@ guide.</b>
26 26
 
27 27
 <p>
28 28
 The install for MS Windows bundles <a href="<page index>">Tor</a>,
29
-<a href="<page vidalia/index>">Vidalia</a> (a GUI for Tor), and <a
30
-href="http://www.privoxy.org">Privoxy</a> (a filtering web proxy) into
31
-one package, with the three applications pre-configured to work together.
29
+<a href="<page vidalia/index>">Vidalia</a> (a GUI for Tor), Torbutton (a
30
+plugin for Mozilla Firefox), and <a
31
+href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a> (a web proxy) into
32
+one package, with the four applications pre-configured to work together.
32 33
 Download either the <a href="../<package-win32-bundle-stable>">stable</a>
33 34
 or the <a href="../<package-win32-bundle-alpha>">experimental</a>
34 35
 version of the Windows bundle, or look for more options on the
... ...
@@ -38,7 +39,7 @@ version of the Windows bundle, or look for more options on the
38 39
 <img alt="tor installer splash page"
39 40
 src="../img/screenshot-win32-installer-splash.png" />
40 41
 
41
-<p>If you have previously installed Tor, Vidalia, or Privoxy
42
+<p>If you have previously installed Tor, Vidalia, or Polipo
42 43
 you can deselect whichever components you do not need to install
43 44
 in the dialog shown below.
44 45
 </p>
... ...
@@ -62,7 +63,7 @@ the settings. Tor is now installed.
62 63
 <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>
63 64
 <br />
64 65
 
65
-<p>After installing Tor and Privoxy, you need to configure your
66
+<p>After installing Tor and Polipo, you need to configure your
66 67
 applications to use them. The first step is to set up web browsing.</p>
67 68
 
68 69
 <p>You should use Tor with Firefox and Torbutton, for best safety. The
... ...
@@ -84,7 +85,7 @@ entry for running Tor on a different computer</a>.
84 85
 </p>
85 86
 
86 87
 <p>To Torify other applications that support HTTP proxies, just
87
-point them at Privoxy (that is, localhost port 8118). To use SOCKS
88
+point them at Polipo (that is, localhost port 8118). To use SOCKS
88 89
 directly (for instant messaging, Jabber, IRC, etc), you can point
89 90
 your application directly at Tor (localhost port 9050), but see <a
90 91
 href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS">this
... ...
@@ -104,10 +105,9 @@ HOWTO</a>.
104 105
 <br />
105 106
 
106 107
 <p>
107
-Check to see that Privoxy and Vidalia are running. Privoxy's icon is
108
-a blue or green circle with a "P" in it, and Vidalia uses a small
109
-green onion to indicate Tor is running or a dark onion with a red "X"
110
-when Tor is not running. You can start or stop Tor by right-clicking
108
+Check to see that Vidalia is running.  Vidalia uses a small green onion
109
+to indicate Tor is running or a dark onion with a red "X" when Tor is
110
+not running. You can start or stop Tor by right-clicking
111 111
 on Vidalia's icon in your system tray and selecting "Start" or "Stop"
112 112
 from the menu as shown below:
113 113
 </p>
... ...
@@ -121,8 +121,6 @@ sure that your IP address is being anonymized. Click on
121 121
 <a href="https://check.torproject.org/">the
122 122
 Tor detector</a>
123 123
 and see whether it thinks you're using Tor or not.
124
-#<a href="http://ipchicken.com/">this site</a>
125
-#to see what IP address it thinks you're using.
126 124
 (If that site is down, see <a
127 125
 href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate">this
128 126
 FAQ entry</a> for more suggestions on how to test your Tor.)
129 127