tor-webwml.git

@@ -33,37 +33,36 @@

     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.

-    Download either the <a href="../<package-osx-bundle-stable>">stable</a>

-    or the <a href="../<package-osx-bundle-alpha>">experimental</a> version

-    of the OS X bundle for Intel, or look for more options on the <a href="<page

+    Download either the <a href="<page download/download>#tor">stable</a>

+    or the <a href="<page download/download>#tor">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>

-    

-    <p>When you are finished installing, you can start Vidalia by selecting its icon

-    from your Applications folder. A dark onion with a red X in your dock means

-    Tor is not currently running. You can start Tor by selecting Start from the

-    "Tor" menu at the top of your screen.

+    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>

+    

+    <p>When you are finished installing, you can start Vidalia by

+    selecting its icon from your Applications folder. A dark onion with a

+    red X in your dock means Tor is not currently running. You can start

+    Tor by selecting Start from the "Tor" menu at the top of your screen.

     </p>

     <p>When Tor is running, Vidalia's dock icon will look like the following:

     </p>

     <p><img alt="vidalia running tor"

-    src="$(IMGROOT)/screenshot-osx-vidalia.png"

-   /></p>

+    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.

+    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>

@@ -71,36 +70,32 @@

     <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>

     <br>

-    <p>After installing, you need to configure your

-    applications to use them. The first step is to set up web browsing.</p>

+    <p>After installing, 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.

-    Torbutton was installed for you.  Click on the red "Tor Disabled" toggle button to

-    turn Tor on, and you're all set: </p>

+    Torbutton was installed for you.  Click on the red "Tor Disabled"

+    toggle button to turn Tor on, and you're all set: </p>

     <p><img alt="Torbutton plugin for Firefox"

-    src="$(IMGROOT)/screenshot-torbutton.png"

-   /></p>

-    

-    <p>

-    If you plan to run Firefox on a different computer than Tor, 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), 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

+    src="$(IMGROOT)/screenshot-torbutton.png" /></p>

+    

+    <p> If you plan to run Firefox on a different computer than Tor,

+    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),

+    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 <a

-    href="http://www.taiyo.co.jp/~gotoh/ssh/connect.html">connect</a> or

-    <a href="http://www.dest-unreach.org/socat/">socat</a>.</p>

+    href="http://www.taiyo.co.jp/~gotoh/ssh/connect.html">connect</a>

+    or <a href="http://www.dest-unreach.org/socat/">socat</a>.</p>

     <p>For information on how to Torify other applications, check out the

-    <a href="<wiki>/TheOnionRouter/TorifyHOWTO">Torify

-    HOWTO</a>.

+    <a href="<wiki>/TheOnionRouter/TorifyHOWTO">Torify HOWTO</a>.

     </p>

     <hr>

@@ -110,13 +105,11 @@

     <p>

     Next, you should try using your browser with Tor and make

-    sure that your IP address is being anonymized. Click on

-    <a href="https://check.torproject.org/">the

-    Tor detector</a>

-    and see whether it thinks you're using Tor or not.

-    (If that site is down, see <a

-    href="<wikifaq>#IsMyConnectionPrivate">this

-    FAQ entry</a> for more suggestions on how to test your Tor.)

+    sure that your IP address is being anonymized. Click on <a

+    href="https://check.torproject.org/">the Tor detector</a> and see

+    whether it thinks you're using Tor or not.  (If that site is down,

+    see <a href="<wikifaq>#IsMyConnectionPrivate">this 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

@@ -129,12 +122,11 @@

     </p>

     <p>If it's still not working, look at <a

-    href="<wikifaq>#ItDoesntWork">this

-    FAQ entry</a> for hints.</p>

+    href="<wikifaq>#ItDoesntWork">this FAQ entry</a> for hints.</p>

     <p>

-    Once it's working, learn more about

-    <a href="<page download/download>#Warning">what Tor does and does not offer</a>.

+    Once it's working, learn more about <a href="<page

+    download/download>#Warning">what Tor does and does not offer</a>.

     </p>

     <hr>

@@ -152,11 +144,10 @@

     IP addresses.</p>

     <p>Having relays in many different places on the Internet is what

-    makes Tor users secure. <a

-    href="<wikifaq>#RelayAnonymity">You

-    may also get stronger anonymity yourself</a>,

-    since remote sites can't know whether connections originated at your

-    computer or were relayed from others.</p>

+    makes Tor users secure. <a href="<wikifaq>#RelayAnonymity">You may

+    also get stronger anonymity yourself</a>, since remote sites can't

+    know whether connections originated at your computer or were relayed

+    from others.</p>

     <p>Read more at our <a href="<page docs/tor-doc-relay>">Configuring a relay</a>

     guide.</p>

@@ -166,11 +157,13 @@

     <h2><a class="anchor" href="#uninstall">How To Uninstall Tor and Privoxy</a></h2>

     <br>

-    <p>There are two ways to uninstall the bundle from your computer, using

-    Finder or a command line or Terminal-based uninstaller.  If you want to remove Tor on OSX, here's how:</p>

+    <p>There are two ways to uninstall the bundle from your computer,

+    using Finder or a command line or Terminal-based uninstaller.

+    If you want to remove Tor on OSX, here's how:</p>

-    <p>Change your application proxy settings back to their original values.

-       If you just want to stop using Tor, you can end at this point.</p>

+    <p>Change your application proxy settings back to their original

+    values.  If you just want to stop using Tor, you can end at this

+    point.</p>

     <p>If you want to completely remove Tor, and your account has Admin

     Privileges, then proceed as follows:</p>