remove the polipo section. these instructions really should be to just install TBB and be done with it.
Andrew Lewman

Andrew Lewman commited on 2011-07-07 13:23:55
Zeige 1 geänderte Dateien mit 5 Einfügungen und 40 Löschungen.

... ...
@@ -51,48 +51,13 @@
51 51
     the settings. Tor is now installed.
52 52
     </p>
53 53
     
54
-    <hr>
55
-    <a id="privoxy"></a>
56
-    <a id="polipo"></a>
57
-    <h2><a class="anchor" href="#polipo">Step Two: Install Polipo for Web Browsing</a></h2>
58
-    <br>
59
-    
60
-    <p>After installing Tor, you need to configure your applications to use it.
61
-    </p>
62
-    
63
-    <p>
64
-    The first step is to set up web browsing. Start by installing <a
65
-    href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a> from
66
-    your favorite repository. Polipo is a caching web proxy that does http
67
-    pipelining well, so it's well-suited for Tor's latencies. Make sure
68
-    to get at least Polipo 1.0.4, since earlier versions lack the SOCKS support
69
-    required to use Polipo with Tor. You should uninstall privoxy at this
70
-    point (e.g. apt-get remove privoxy or yum remove privoxy), so they don't
71
-    conflict.
72
-    </p>
73
-    
74
-    <p>Once you've installed Polipo (either from package or from
75
-    source), <b>you will need to configure Polipo to use Tor</b>. Grab our <a
76
-    href="<tbbrepo>/build-scripts/config/polipo.conf">Polipo
77
-    configuration for Tor</a> and put it in place of your current polipo
78
-    config file (e.g. /etc/polipo/config or ~/.polipo).
79
-    You'll need to restart Polipo for the changes to take effect. For
80
-    example:<br>
81
-    <tt>/etc/init.d/polipo restart</tt>
82
-    </p>
83
-    
84
-    <p>If you prefer, you can instead use Privoxy with <a
85
-    href="<wiki>doc/PrivoxyConfig">this
86
-    sample Privoxy configuration</a>. But since the config files both use
87
-    port 8118, you shouldn't run both Polipo and Privoxy at the same time.</p>
88
-    
89 54
     <hr>
90 55
     <a id="using"></a>
91
-    <h2><a class="anchor" href="#using">Step Three: Configure your applications to use Tor</a></h2>
56
+    <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>
92 57
     <br>
93 58
     
94
-    <p>After installing Tor and Polipo, you need to configure your
95
-    applications to use them. The first step is to set up web browsing.</p>
59
+    <p>After installing Tor, you need to configure your applications to
60
+    use them. The first step is to set up web browsing.</p>
96 61
     
97 62
     <p>You should use Tor with Firefox and Torbutton, for best safety.
98 63
     Simply install the <a
... ...
@@ -131,7 +96,7 @@
131 96
     
132 97
     <hr>
133 98
     <a id="verify"></a>
134
-    <h2><a class="anchor" href="#verify">Step Four: Make sure it's working</a></h2>
99
+    <h2><a class="anchor" href="#verify">Step Three: Make sure it's working</a></h2>
135 100
     <br>
136 101
     
137 102
     <p>
... ...
@@ -169,7 +134,7 @@
169 134
     <hr>
170 135
     <a id="server"></a>
171 136
     <a id="relay"></a>
172
-    <h2><a class="anchor" href="#relay">Step Five: Configure it as a relay</a></h2>
137
+    <h2><a class="anchor" href="#relay">Step Four: Configure it as a relay</a></h2>
173 138
     <br>
174 139
     
175 140
     <p>The Tor network relies on volunteers to donate bandwidth. The more
176 141