Browse code

remove polipo from doc pages, fix ticket 5706.

Andrew Lewman authored on 20/06/2012 22:59:43
Showing 2 changed files
... ...
@@ -25,25 +25,21 @@
25 25
     <br>
26 26
     
27 27
     <p>
28
-    The install for Macintosh OS X bundles
29
-    <a href="<page index>">Tor</a>,
30
-    <a href="<page projects/vidalia>">Vidalia</a> (a graphical interface for Tor),
31
-    <a href="<page torbutton/index>">Torbutton</a>,
32
-    and <a href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a> (a web proxy)
33
-    into one package, with the four applications pre-configured to work
34
-    together.
28
+    The install for Macintosh OS X bundles <a href="<page index>">Tor</a>,
29
+    <a href="<page projects/vidalia>">Vidalia</a> (a graphical interface
30
+    for Tor), <a href="<page torbutton/index>">Torbutton</a>, into one
31
+    package, with the three applications pre-configured to work together.
35 32
     Download either the <a href="<page download/download>#mac">stable</a>
36
-    or the <a href="<page download/download>#mac">experimental</a> version
37
-    of the OS X bundle, or look for more options on the <a href="<page
38
-    download/download>">download page</a>.
33
+    or the <a href="<page download/download>#mac">experimental</a>
34
+    version of the OS X bundle, or look for more options on the <a
35
+    href="<page download/download>">download page</a>.
39 36
     </p>
40 37
     
41 38
     <p>Once you've downloaded the dmg, double-click and let it mount.
42 39
     Browse to the now open Vidalia Bundle in Finder.  It's easy to
43 40
     install the bundle; simply drag and drop the Vidalia onion icon to the
44 41
     Applications folder.  Optionally, double click the "install torbutton"
45
-    script and let it install torbutton into Firefox.  You can also get
46
-    Torbutton from Mozilla Add-ons by searching for "torbutton".</p>
42
+    script and let it install torbutton into Firefox.</p>
47 43
     
48 44
     <p>When you are finished installing, you can start Vidalia by
49 45
     selecting its icon from your Applications folder. A dark onion with a
... ...
@@ -57,13 +53,6 @@
57 53
     <p><img alt="vidalia running tor"
58 54
     src="$(IMGROOT)/screenshot-osx-vidalia.png" /></p>
59 55
     
60
-    <p>Polipo is installed as part of the Tor bundle package
61
-    installer. Once it is installed, it will start automatically when
62
-    your computer is restarted.  You do not need to configure Polipo
63
-    to use Tor &mdash; a custom Polipo configuration for Tor has been
64
-    installed as part of the installer package.
65
-    </p>
66
-    
67 56
     <hr>
68 57
     <a id="using"></a>
69 58
     <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>
... ...
@@ -83,9 +72,7 @@
83 72
     see the <a href="<wikifaq>#SocksListenAddress">FAQ entry for running
84 73
     Tor on a different computer</a>.  </p>
85 74
     
86
-    <p>To Torify other applications that support HTTP proxies,
87
-    just point them at Polipo (that is, localhost port 8118). To
88
-    use SOCKS directly (for instant messaging, Jabber, IRC, etc),
75
+    <p>To use SOCKS directly (for instant messaging, Jabber, IRC, etc),
89 76
     you can point your application directly at Tor (localhost
90 77
     port 9050), but see <a href="<wikifaq>#SOCKSAndDNS">this FAQ
91 78
     entry</a> for why this may be dangerous. For applications
... ...
@@ -112,11 +99,10 @@
112 99
     
113 100
     <p>If you have a personal firewall that limits your computer's
114 101
     ability to connect to itself, be sure to allow connections from
115
-    your local applications to local port 8118 and port 9050. If
116
-    your firewall blocks outgoing connections, punch a hole so
117
-    it can connect to at least TCP ports 80 and 443, and then see <a
118
-    href="<wikifaq>#FirewalledClient">this
119
-    FAQ entry</a>.
102
+    your local applications to local port 9050. If your
103
+    firewall blocks outgoing connections, punch a hole so it can
104
+    connect to at least TCP ports 80 and 443, and then see <a
105
+    href="<wikifaq>#FirewalledClient">this FAQ entry</a>.
120 106
     </p>
121 107
     
122 108
     <p>If it's still not working, look at <a
... ...
@@ -174,7 +160,7 @@
174 160
     directory</li>
175 161
     </ol>
176 162
     
177
-    <p>Tor, Vidalia, and Polipo are now completely removed from your system.</p>
163
+    <p>Tor and Vidalia are now completely removed from your system.</p>
178 164
     
179 165
     <p>If you're familiar with the command line or Terminal, you can
180 166
     manually type the following:</p>
... ...
@@ -43,23 +43,21 @@
43 43
     <br>
44 44
     
45 45
     <p>
46
-    The Vidalia Bundle for Windows contains <a href="<page index>">Tor</a>, <a
47
-    href="<page projects/vidalia>">Vidalia</a> (a GUI for Tor), <a
48
-    href="<page torbutton/index>">Torbutton</a> (a plugin for Mozilla Firefox), and <a
49
-    href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a>
50
-    (a web proxy) packaged into one bundle, with the four applications
51
-    pre-configured to work together.  Download either the <a
52
-    href="../<package-win32-bundle-stable>">stable</a> or the <a
46
+    The Vidalia Bundle for Windows contains <a href="<page
47
+    index>">Tor</a>, <a href="<page projects/vidalia>">Vidalia</a>
48
+    (a GUI for Tor), and <a href="<page torbutton/index>">Torbutton</a>
49
+    (a plugin for Mozilla Firefox) packaged into one bundle, with the
50
+    three applications pre-configured to work together.  Download either
51
+    the <a href="../<package-win32-bundle-stable>">stable</a> or the <a
53 52
     href="../<package-win32-bundle-alpha>">experimental</a> version of
54 53
     the Vidalia Bundle, or look for more options on the <a href="<page
55
-    download/download>">download page</a>.
56
-    </p>
54
+    download/download>">download page</a>.</p>
57 55
     
58 56
     <img alt="tor installer splash page" src="$(IMGROOT)/screenshot-win32-installer-splash.png">
59 57
     
60
-    <p>If you have previously installed Tor, Vidalia, or Polipo
61
-    you can deselect whichever components you do not need to install
62
-    in the dialog shown below.
58
+    <p>If you have previously installed Tor and Vidalia you can deselect
59
+    whichever components you do not need to install in the dialog
60
+    shown below.
63 61
     </p>
64 62
     
65 63
     <img alt="select components to install" src="$(IMGROOT)/screenshot-win32-installer-components.png">
... ...
@@ -78,13 +76,12 @@
78 76
     <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>
79 77
     <br>
80 78
     
81
-    <p>After installing Tor and Polipo, you need to configure your
82
-    applications to use them. The first step is to set up web browsing.</p>
79
+    <p>After installing Tor, you need to configure your applications to
80
+    use them. The first step is to set up web browsing.</p>
83 81
     
84
-    <p>You should use Tor with Firefox and Torbutton,
85
-    for best safety. The bundle installs the <a
86
-    href="<page torbutton/index>">Torbutton plugin</a>
87
-    for you. Restart your Firefox, and you're all set:
82
+    <p>You should use Tor with Firefox and Torbutton, for best safety. The
83
+    bundle installs the <a href="<page torbutton/index>">Torbutton
84
+    plugin</a> for you. Restart your Firefox, and you're all set:
88 85
     </p>
89 86
     
90 87
     <img alt="Torbutton plugin for Firefox" src="$(IMGROOT)/screenshot-torbutton.png"/>
... ...
@@ -97,15 +94,13 @@
97 94
     entry for running Tor on a different computer</a>.
98 95
     </p>
99 96
     
100
-    <p>To Torify other applications that support HTTP proxies, just
101
-    point them at Polipo (that is, localhost port 8118). To use SOCKS
102
-    directly (for instant messaging, Jabber, IRC, etc), you can point
103
-    your application directly at Tor (localhost port 9050), but see <a
104
-    href="<wikifaq>#SOCKSAndDNS">this
105
-    FAQ entry</a> for why this may be dangerous. For applications
106
-    that support neither SOCKS nor HTTP, take a look at SocksCap or
107
-    <a href="http://www.freecap.ru/eng/">FreeCap</a>.
108
-    (FreeCap is free software; SocksCap is proprietary.)</p>
97
+    <p>To use SOCKS directly (for instant messaging, Jabber, IRC,
98
+    etc), you can point your application directly at Tor (localhost
99
+    port 9050), but see <a href="<wikifaq>#SOCKSAndDNS">this FAQ
100
+    entry</a> for why this may be dangerous. For applications that
101
+    support neither SOCKS nor HTTP, take a look at SocksCap or <a
102
+    href="http://www.freecap.ru/eng/">FreeCap</a>.  (FreeCap is free
103
+    software; SocksCap is proprietary.)</p>
109 104
     
110 105
     <p>For information on how to Torify other applications, check out the
111 106
     <a href="<wiki>doc/TorifyHOWTO">Torify
... ...
@@ -136,12 +131,11 @@
136 131
     FAQ entry</a> for more suggestions on how to test your Tor.)
137 132
     </p>
138 133
     
139
-    <p>If you have a personal firewall that limits your computer's
140
-    ability to connect to itself, be sure to allow connections from
141
-    your local applications to local port 8118 and port 9050. If
142
-    your firewall blocks outgoing connections, punch a hole so
143
-    it can connect to at least TCP ports 80 and 443, and then see <a
144
-    href="<wikifaq>#FirewalledClient">this
134
+    <p>If you have a personal firewall that limits your computer's ability
135
+    to connect to itself, be sure to allow connections from your local
136
+    applications to local port 9050. If your firewall blocks outgoing
137
+    connections, punch a hole so it can connect to at least TCP ports
138
+    80 and 443, and then see <a href="<wikifaq>#FirewalledClient">this
145 139
     FAQ entry</a>.
146 140
     </p>
147 141