diff --git a/docs/en/tor-doc-osx.wml b/docs/en/tor-doc-osx.wml index ec29a45d..bba11338 100644 --- a/docs/en/tor-doc-osx.wml +++ b/docs/en/tor-doc-osx.wml @@ -33,37 +33,36 @@ and Polipo (a web proxy) into one package, with the four applications pre-configured to work together. - Download either the stable - or the experimental version - of the OS X bundle for Intel, or look for more options on the #tor">stable + or the experimental version + of the OS X bundle, or look for more options on the download page.

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

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

-

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

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.

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

vidalia running tor

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

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.


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

Step Two: Configure your applications to use Tor


-

After installing, you need to configure your - applications to use them. The first step is to set up web browsing.

+

After installing, you need to configure your applications to use + them. The first step is to set up web browsing.

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:

+ Torbutton was installed for you. Click on the red "Tor Disabled" + toggle button to turn Tor on, and you're all set:

Torbutton plugin for Firefox

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

-

- If you plan to run Firefox on a different computer than Tor, see the FAQ - entry for running Tor on a different computer. -

+

If you plan to run Firefox on a different computer than Tor, + see the FAQ entry for running + Tor on a different computer.

-

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 this - FAQ entry for why this may be dangerous. For applications +

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 this FAQ + entry for why this may be dangerous. For applications that support neither SOCKS nor HTTP, take a look at connect or - socat.

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

For information on how to Torify other applications, check out the - Torify - HOWTO. + Torify HOWTO.


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

Next, you should try using your browser with Tor and make - sure that your IP address is being anonymized. Click on - the - Tor detector - and see whether it thinks you're using Tor or not. - (If that site is down, see this - FAQ entry for more suggestions on how to test your Tor.) + sure that your IP address is being anonymized. Click on the Tor detector and see + whether it thinks you're using Tor or not. (If that site is down, + see this FAQ entry + for more suggestions on how to test your Tor.)

If you have a personal firewall that limits your computer's @@ -129,12 +122,11 @@

If it's still not working, look at this - FAQ entry for hints.

+ href="#ItDoesntWork">this FAQ entry for hints.

- Once it's working, learn more about - what Tor does and does not offer. + Once it's working, learn more about what Tor does and does not offer.


@@ -152,11 +144,10 @@ IP addresses.

Having relays in many different places on the Internet is what - makes Tor users secure. You - may also get stronger anonymity yourself, - since remote sites can't know whether connections originated at your - computer or were relayed from others.

+ makes Tor users secure. You may + also get stronger anonymity yourself, since remote sites can't + know whether connections originated at your computer or were relayed + from others.

Read more at our Configuring a relay guide.

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

How To Uninstall Tor and Privoxy


-

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:

+

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:

-

Change your application proxy settings back to their original values. - If you just want to stop using Tor, you can end at this point.

+

Change your application proxy settings back to their original + values. If you just want to stop using Tor, you can end at this + point.

If you want to completely remove Tor, and your account has Admin Privileges, then proceed as follows: