[tor-commits] r25690: {website} remove polipo from doc pages, fix ticket 5706. (website/trunk/docs/en)

Andrew Lewman andrew at torproject.org
Wed Jun 20 20:59:44 UTC 2012


Author: phobos
Date: 2012-06-20 20:59:43 +0000 (Wed, 20 Jun 2012)
New Revision: 25690

Modified:
   website/trunk/docs/en/tor-doc-osx.wml
   website/trunk/docs/en/tor-doc-windows.wml
Log:
remove polipo from doc pages, fix ticket 5706.


Modified: website/trunk/docs/en/tor-doc-osx.wml
===================================================================
--- website/trunk/docs/en/tor-doc-osx.wml	2012-06-20 20:46:11 UTC (rev 25689)
+++ website/trunk/docs/en/tor-doc-osx.wml	2012-06-20 20:59:43 UTC (rev 25690)
@@ -25,25 +25,21 @@
     <br>
     
     <p>
-    The install for Macintosh OS X bundles
-    <a href="<page index>">Tor</a>,
-    <a href="<page projects/vidalia>">Vidalia</a> (a graphical interface for Tor),
-    <a href="<page torbutton/index>">Torbutton</a>,
-    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.
+    The install for Macintosh OS X bundles <a href="<page index>">Tor</a>,
+    <a href="<page projects/vidalia>">Vidalia</a> (a graphical interface
+    for Tor), <a href="<page torbutton/index>">Torbutton</a>, into one
+    package, with the three applications pre-configured to work together.
     Download either the <a href="<page download/download>#mac">stable</a>
-    or the <a href="<page download/download>#mac">experimental</a> version
-    of the OS X bundle, or look for more options on the <a href="<page
-    download/download>">download page</a>.
+    or the <a href="<page download/download>#mac">experimental</a>
+    version of the OS X bundle, or look for more options on the <a
+    href="<page download/download>">download page</a>.
     </p>
     
     <p>Once you've downloaded the dmg, double-click and let it mount.
     Browse to the now open Vidalia Bundle in Finder.  It's easy to
     install the bundle; simply drag and drop the Vidalia onion icon to the
     Applications folder.  Optionally, double click the "install torbutton"
-    script and let it install torbutton into Firefox.  You can also get
-    Torbutton from Mozilla Add-ons by searching for "torbutton".</p>
+    script and let it install torbutton into Firefox.</p>
     
     <p>When you are finished installing, you can start Vidalia by
     selecting its icon from your Applications folder. A dark onion with a
@@ -57,13 +53,6 @@
     <p><img alt="vidalia running tor"
     src="$(IMGROOT)/screenshot-osx-vidalia.png" /></p>
     
-    <p>Polipo is installed as part of the Tor bundle package
-    installer. Once it is installed, it will start automatically when
-    your computer is restarted.  You do not need to configure Polipo
-    to use Tor — a custom Polipo configuration for Tor has been
-    installed as part of the installer package.
-    </p>
-    
     <hr>
     <a id="using"></a>
     <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>
@@ -83,9 +72,7 @@
     see the <a href="<wikifaq>#SocksListenAddress">FAQ entry for running
     Tor on a different computer</a>.  </p>
     
-    <p>To Torify other applications that support HTTP proxies,
-    just point them at Polipo (that is, localhost port 8118). To
-    use SOCKS directly (for instant messaging, Jabber, IRC, etc),
+    <p>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="<wikifaq>#SOCKSAndDNS">this FAQ
     entry</a> for why this may be dangerous. For applications
@@ -112,11 +99,10 @@
     
     <p>If you have a personal firewall that limits your computer's
     ability to connect to itself, be sure to allow connections from
-    your local applications to local port 8118 and port 9050. If
-    your firewall blocks outgoing connections, punch a hole so
-    it can connect to at least TCP ports 80 and 443, and then see <a
-    href="<wikifaq>#FirewalledClient">this
-    FAQ entry</a>.
+    your local applications to local port 9050. If your
+    firewall blocks outgoing connections, punch a hole so it can
+    connect to at least TCP ports 80 and 443, and then see <a
+    href="<wikifaq>#FirewalledClient">this FAQ entry</a>.
     </p>
     
     <p>If it's still not working, look at <a
@@ -174,7 +160,7 @@
     directory</li>
     </ol>
     
-    <p>Tor, Vidalia, and Polipo are now completely removed from your system.</p>
+    <p>Tor and Vidalia are now completely removed from your system.</p>
     
     <p>If you're familiar with the command line or Terminal, you can
     manually type the following:</p>

Modified: website/trunk/docs/en/tor-doc-windows.wml
===================================================================
--- website/trunk/docs/en/tor-doc-windows.wml	2012-06-20 20:46:11 UTC (rev 25689)
+++ website/trunk/docs/en/tor-doc-windows.wml	2012-06-20 20:59:43 UTC (rev 25690)
@@ -43,23 +43,21 @@
     <br>
     
     <p>
-    The Vidalia Bundle for Windows contains <a href="<page index>">Tor</a>, <a
-    href="<page projects/vidalia>">Vidalia</a> (a GUI for Tor), <a
-    href="<page torbutton/index>">Torbutton</a> (a plugin for Mozilla Firefox), and <a
-    href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a>
-    (a web proxy) packaged into one bundle, with the four applications
-    pre-configured to work together.  Download either the <a
-    href="../<package-win32-bundle-stable>">stable</a> or the <a
+    The Vidalia Bundle for Windows contains <a href="<page
+    index>">Tor</a>, <a href="<page projects/vidalia>">Vidalia</a>
+    (a GUI for Tor), and <a href="<page torbutton/index>">Torbutton</a>
+    (a plugin for Mozilla Firefox) packaged into one bundle, with the
+    three 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 Vidalia Bundle, or look for more options on the <a href="<page
-    download/download>">download page</a>.
-    </p>
+    download/download>">download page</a>.</p>
     
     <img alt="tor installer splash page" src="$(IMGROOT)/screenshot-win32-installer-splash.png">
     
-    <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>If you have previously installed Tor and Vidalia you can deselect
+    whichever components you do not need to install in the dialog
+    shown below.
     </p>
     
     <img alt="select components to install" src="$(IMGROOT)/screenshot-win32-installer-components.png">
@@ -78,13 +76,12 @@
     <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>
     <br>
     
-    <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>After installing Tor, 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 bundle installs the <a
-    href="<page torbutton/index>">Torbutton plugin</a>
-    for you. Restart your Firefox, and you're all set:
+    <p>You should use Tor with Firefox and Torbutton, for best safety. The
+    bundle installs the <a href="<page torbutton/index>">Torbutton
+    plugin</a> for you. Restart your Firefox, and you're all set:
     </p>
     
     <img alt="Torbutton plugin for Firefox" src="$(IMGROOT)/screenshot-torbutton.png"/>
@@ -97,15 +94,13 @@
     entry for running Tor on a different computer</a>.
     </p>
     
-    <p>To Torify other applications that support HTTP proxies, just
-    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="<wikifaq>#SOCKSAndDNS">this
-    FAQ entry</a> for why this may be dangerous. For applications
-    that support neither SOCKS nor HTTP, take a look at SocksCap or
-    <a href="http://www.freecap.ru/eng/">FreeCap</a>.
-    (FreeCap is free software; SocksCap is proprietary.)</p>
+    <p>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="<wikifaq>#SOCKSAndDNS">this FAQ
+    entry</a> for why this may be dangerous. For applications that
+    support neither SOCKS nor HTTP, take a look at SocksCap or <a
+    href="http://www.freecap.ru/eng/">FreeCap</a>.  (FreeCap is free
+    software; SocksCap is proprietary.)</p>
     
     <p>For information on how to Torify other applications, check out the
     <a href="<wiki>doc/TorifyHOWTO">Torify
@@ -136,12 +131,11 @@
     FAQ entry</a> for more suggestions on how to test your Tor.)
     </p>
     
-    <p>If you have a personal firewall that limits your computer's
-    ability to connect to itself, be sure to allow connections from
-    your local applications to local port 8118 and port 9050. If
-    your firewall blocks outgoing connections, punch a hole so
-    it can connect to at least TCP ports 80 and 443, and then see <a
-    href="<wikifaq>#FirewalledClient">this
+    <p>If you have a personal firewall that limits your computer's ability
+    to connect to itself, be sure to allow connections from your local
+    applications to local port 9050. If your firewall blocks outgoing
+    connections, punch a hole so it can connect to at least TCP ports
+    80 and 443, and then see <a href="<wikifaq>#FirewalledClient">this
     FAQ entry</a>.
     </p>
     



More information about the tor-commits mailing list