Browse code

finish purging polipo from the docs.

Andrew Lewman authored on 07/07/2011 13:32:10
Showing 1 changed files
... ...
@@ -14,10 +14,10 @@
14 14
     <br>
15 15
     
16 16
     <p>
17
-    <b>Note that these are the installation instructions for running a Tor
18
-    client. If you want to relay traffic for others to help the network grow
19
-    (please do), read the <a
20
-    href="<page docs/tor-doc-relay>">Configuring a relay</a> guide.</b>
17
+    <b>Note that these are the installation instructions for running a
18
+    Tor client. The easiest way to do this is to simply download the <a
19
+    href="<page projects/torbrowser>"Tor Browser Bundle</a> and you are
20
+    done. </b>
21 21
     </p>
22 22
     
23 23
     <hr>
... ...
@@ -78,20 +78,16 @@
78 78
     entry for running Tor on a different computer</a>.
79 79
     </p>
80 80
     
81
-    <p>To Torify other applications that support HTTP proxies, just
82
-    point them at Polipo (that is, localhost port 8118). To use SOCKS
83
-    directly (for instant messaging, Jabber, IRC, etc), you can point
84
-    your application directly at Tor (localhost port 9050), but see <a
85
-    href="<wikifaq>#SOCKSAndDNS">this
86
-    FAQ entry</a> for why this may be dangerous. For applications
87
-    that support neither SOCKS nor HTTP, take a look at <a
88
-    href="https://code.google.com/p/torsocks/">torsocks</a> or <a
89
-    href="<wiki>doc/TorifyHOWTO#socat">socat</a>.
81
+    <p>To Torify other applications that support SOCKS proxies, just
82
+    point them at Tor's SOCKS port (127.0.0.1 port 9050). See <a
83
+    href="<wikifaq>#SOCKSAndDNS">this FAQ entry</a> for why this may be
84
+    dangerous. For applications that support neither SOCKS nor HTTP, take
85
+    a look at <a href="https://code.google.com/p/torsocks/">torsocks</a>
86
+    or <a href="<wiki>doc/TorifyHOWTO#socat">socat</a>.
90 87
     </p>
91 88
     
92 89
     <p>For information on how to Torify other applications, check out the
93
-    <a href="<wiki>doc/TorifyHOWTO">Torify
94
-    HOWTO</a>.
90
+    <a href="<wiki>doc/TorifyHOWTO">Torify HOWTO</a>.
95 91
     </p>
96 92
     
97 93
     <hr>
... ...
@@ -101,30 +97,26 @@
101 97
     
102 98
     <p>
103 99
     Next, you should try using your browser with Tor and make
104
-    sure that your IP address is being anonymized. Click on
105
-    <a href="https://check.torproject.org/">the
106
-    Tor detector</a>
107
-    and see whether it thinks you're using Tor or not.
108
-    #<a href="http://ipchicken.com/">this site</a>
109
-    #to see what IP address it thinks you're using.
110
-    (If that site is down, see <a
111
-    href="<wikifaq>#IsMyConnectionPrivate">this
112
-    FAQ entry</a> for more suggestions on how to test your Tor.)
100
+    sure that your IP address is being anonymized. Click on <a
101
+    href="https://check.torproject.org/">the Tor detector</a>
102
+    and see whether it thinks you're using Tor or not.  #<a
103
+    href="http://ipchicken.com/">this site</a> #to see what IP
104
+    address it thinks you're using.  (If that site is down, see <a
105
+    href="<wikifaq>#IsMyConnectionPrivate">this FAQ entry</a> for more
106
+    suggestions on how to test your Tor.)
113 107
     </p>
114 108
     
115
-    <p>If you have a personal firewall that limits your computer's
116
-    ability to connect to itself (this includes something like SELinux on
117
-    Fedora Core 4), be sure to allow connections from
118
-    your local applications to Polipo (local port 8118) and Tor (local port
119
-    9050). If
120
-    your firewall blocks outgoing connections, punch a hole so
121
-    it can connect to at least TCP ports 80 and 443, and then see <a
122
-    href="<wikifaq>#FirewalledClient">this
123
-    FAQ entry</a>.  If your SELinux config is not allowing tor or privoxy to
124
-    run correctly, create a file named booleans.local in the directory
125
-    /etc/selinux/targeted.  Edit this file in your favorite text editor and
126
-    insert "allow_ypbind=1".  Restart your machine for this change to take
127
-    effect.
109
+    <p>If you have a personal firewall that limits your computer's ability
110
+    to connect to itself (this includes something like SELinux on Fedora
111
+    Core 4), be sure to allow connections from your local applications to
112
+    Tor (local port 9050). If your firewall blocks outgoing connections,
113
+    punch a hole so it can connect to at least TCP ports 80 and 443, and
114
+    then see <a href="<wikifaq>#FirewalledClient">this FAQ entry</a>.
115
+    If your SELinux config is not allowing tor or privoxy to run
116
+    correctly, create a file named booleans.local in the directory
117
+    /etc/selinux/targeted.  Edit this file in your favorite text editor
118
+    and insert "allow_ypbind=1".  Restart your machine for this change
119
+    to take effect.
128 120
     </p>
129 121
     
130 122
     <p>If it's still not working, look at <a
... ...
@@ -139,19 +131,18 @@
139 131
     
140 132
     <p>The Tor network relies on volunteers to donate bandwidth. The more
141 133
     people who run relays, the faster the Tor network will be. If you have
142
-    at least 20 kilobytes/s each way, please help out Tor by configuring your
134
+    at least 20 KiloBytes/s each way, please help out Tor by configuring your
143 135
     Tor to be a relay too. We have many features that make Tor relays easy
144 136
     and convenient, including rate limiting for bandwidth, exit policies so
145 137
     you can limit your exposure to abuse complaints, and support for dynamic
146 138
     IP addresses.</p>
147 139
     
148 140
     <p>Having relays in many different places on the Internet is what
149
-    makes Tor users secure. <a
150
-    href="<wikifaq>#RelayAnonymity">You
151
-    may also get stronger anonymity yourself</a>,
152
-    since remote sites can't know whether connections originated at your
153
-    computer or were relayed from others.</p>
154
-    
141
+    makes Tor users secure. <a href="<wikifaq>#RelayAnonymity">You may
142
+    also get stronger anonymity yourself</a>, since remote sites can't
143
+    know whether connections originated at your computer or were relayed
144
+    from others.</p>
145
+
155 146
     <p>Read more at our <a href="<page docs/tor-doc-relay>">Configuring a relay</a>
156 147
     guide.</p>
157 148