Browse code

fix mistakes and bad links in the osx instructions.

Andrew Lewman authored on 11/10/2010 14:22:26
Showing 1 changed files
... ...
@@ -33,37 +33,36 @@
33 33
     and <a href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a> (a web proxy)
34 34
     into one package, with the four applications pre-configured to work
35 35
     together.
36
-    Download either the <a href="../<package-osx-bundle-stable>">stable</a>
37
-    or the <a href="../<package-osx-bundle-alpha>">experimental</a> version
38
-    of the OS X bundle for Intel, or look for more options on the <a href="<page
36
+    Download either the <a href="<page download/download>#tor">stable</a>
37
+    or the <a href="<page download/download>#tor">experimental</a> version
38
+    of the OS X bundle, or look for more options on the <a href="<page
39 39
     download/download>">download page</a>.
40 40
     </p>
41 41
     
42 42
     <p>Once you've downloaded the dmg, double-click and let it mount.
43
-    Browse to the now open Vidalia Bundle in Finder.  It's easy to install the bundle; simply drag and drop the Vidalia
44
-    onion icon to the Applications folder.  Optionally, double click the
45
-    "install torbutton" script and let it install torbutton into Firefox.
46
-    You can also get Torbutton from Mozilla Add-ons by searching for
47
-    "torbutton".</p>
48
-    
49
-    <p>When you are finished installing, you can start Vidalia by selecting its icon
50
-    from your Applications folder. A dark onion with a red X in your dock means
51
-    Tor is not currently running. You can start Tor by selecting Start from the
52
-    "Tor" menu at the top of your screen.
43
+    Browse to the now open Vidalia Bundle in Finder.  It's easy to
44
+    install the bundle; simply drag and drop the Vidalia onion icon to the
45
+    Applications folder.  Optionally, double click the "install torbutton"
46
+    script and let it install torbutton into Firefox.  You can also get
47
+    Torbutton from Mozilla Add-ons by searching for "torbutton".</p>
48
+    
49
+    <p>When you are finished installing, you can start Vidalia by
50
+    selecting its icon from your Applications folder. A dark onion with a
51
+    red X in your dock means Tor is not currently running. You can start
52
+    Tor by selecting Start from the "Tor" menu at the top of your screen.
53 53
     </p>
54 54
     
55 55
     <p>When Tor is running, Vidalia's dock icon will look like the following:
56 56
     </p>
57 57
     
58 58
     <p><img alt="vidalia running tor"
59
-    src="$(IMGROOT)/screenshot-osx-vidalia.png"
60
-   /></p>
59
+    src="$(IMGROOT)/screenshot-osx-vidalia.png" /></p>
61 60
     
62 61
     <p>Polipo is installed as part of the Tor bundle package
63
-    installer. Once it is installed, it will start automatically when your
64
-    computer is restarted.
65
-    You do not need to configure Polipo to use Tor &mdash; a custom Polipo 
66
-    configuration for Tor has been installed as part of the installer package.
62
+    installer. Once it is installed, it will start automatically when
63
+    your computer is restarted.  You do not need to configure Polipo
64
+    to use Tor &mdash; a custom Polipo configuration for Tor has been
65
+    installed as part of the installer package.
67 66
     </p>
68 67
     
69 68
     <hr>
... ...
@@ -71,36 +70,32 @@
71 70
     <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>
72 71
     <br>
73 72
     
74
-    <p>After installing, you need to configure your
75
-    applications to use them. The first step is to set up web browsing.</p>
73
+    <p>After installing, you need to configure your applications to use
74
+    them. The first step is to set up web browsing.</p>
76 75
     
77 76
     <p>You should use Tor with Firefox and Torbutton, for best safety.
78
-    Torbutton was installed for you.  Click on the red "Tor Disabled" toggle button to
79
-    turn Tor on, and you're all set: </p>
77
+    Torbutton was installed for you.  Click on the red "Tor Disabled"
78
+    toggle button to turn Tor on, and you're all set: </p>
80 79
     
81 80
     <p><img alt="Torbutton plugin for Firefox"
82
-    src="$(IMGROOT)/screenshot-torbutton.png"
83
-   /></p>
84
-    
85
-    <p>
86
-    If you plan to run Firefox on a different computer than Tor, see the <a
87
-    href="<wikifaq>#SocksListenAddress">FAQ
88
-    entry for running Tor on a different computer</a>.
89
-    </p>
90
-    
91
-    <p>To Torify other applications that support HTTP proxies, just
92
-    point them at Polipo (that is, localhost port 8118). To use SOCKS
93
-    directly (for instant messaging, Jabber, IRC, etc), you can point
94
-    your application directly at Tor (localhost port 9050), but see <a
95
-    href="<wikifaq>#SOCKSAndDNS">this
96
-    FAQ entry</a> for why this may be dangerous. For applications
81
+    src="$(IMGROOT)/screenshot-torbutton.png" /></p>
82
+    
83
+    <p> If you plan to run Firefox on a different computer than Tor,
84
+    see the <a href="<wikifaq>#SocksListenAddress">FAQ entry for running
85
+    Tor on a different computer</a>.  </p>
86
+    
87
+    <p>To Torify other applications that support HTTP proxies,
88
+    just point them at Polipo (that is, localhost port 8118). To
89
+    use SOCKS directly (for instant messaging, Jabber, IRC, etc),
90
+    you can point your application directly at Tor (localhost
91
+    port 9050), but see <a href="<wikifaq>#SOCKSAndDNS">this FAQ
92
+    entry</a> for why this may be dangerous. For applications
97 93
     that support neither SOCKS nor HTTP, take a look at <a
98
-    href="http://www.taiyo.co.jp/~gotoh/ssh/connect.html">connect</a> or
99
-    <a href="http://www.dest-unreach.org/socat/">socat</a>.</p>
94
+    href="http://www.taiyo.co.jp/~gotoh/ssh/connect.html">connect</a>
95
+    or <a href="http://www.dest-unreach.org/socat/">socat</a>.</p>
100 96
     
101 97
     <p>For information on how to Torify other applications, check out the
102
-    <a href="<wiki>/TheOnionRouter/TorifyHOWTO">Torify
103
-    HOWTO</a>.
98
+    <a href="<wiki>/TheOnionRouter/TorifyHOWTO">Torify HOWTO</a>.
104 99
     </p>
105 100
     
106 101
     <hr>
... ...
@@ -110,13 +105,11 @@
110 105
     
111 106
     <p>
112 107
     Next, you should try using your browser with Tor and make
113
-    sure that your IP address is being anonymized. Click on
114
-    <a href="https://check.torproject.org/">the
115
-    Tor detector</a>
116
-    and see whether it thinks you're using Tor or not.
117
-    (If that site is down, see <a
118
-    href="<wikifaq>#IsMyConnectionPrivate">this
119
-    FAQ entry</a> for more suggestions on how to test your Tor.)
108
+    sure that your IP address is being anonymized. Click on <a
109
+    href="https://check.torproject.org/">the Tor detector</a> and see
110
+    whether it thinks you're using Tor or not.  (If that site is down,
111
+    see <a href="<wikifaq>#IsMyConnectionPrivate">this FAQ entry</a>
112
+    for more suggestions on how to test your Tor.)
120 113
     </p>
121 114
     
122 115
     <p>If you have a personal firewall that limits your computer's
... ...
@@ -129,12 +122,11 @@
129 122
     </p>
130 123
     
131 124
     <p>If it's still not working, look at <a
132
-    href="<wikifaq>#ItDoesntWork">this
133
-    FAQ entry</a> for hints.</p>
125
+    href="<wikifaq>#ItDoesntWork">this FAQ entry</a> for hints.</p>
134 126
     
135 127
     <p>
136
-    Once it's working, learn more about
137
-    <a href="<page download/download>#Warning">what Tor does and does not offer</a>.
128
+    Once it's working, learn more about <a href="<page
129
+    download/download>#Warning">what Tor does and does not offer</a>.
138 130
     </p>
139 131
     
140 132
     <hr>
... ...
@@ -152,11 +144,10 @@
152 144
     IP addresses.</p>
153 145
     
154 146
     <p>Having relays in many different places on the Internet is what
155
-    makes Tor users secure. <a
156
-    href="<wikifaq>#RelayAnonymity">You
157
-    may also get stronger anonymity yourself</a>,
158
-    since remote sites can't know whether connections originated at your
159
-    computer or were relayed from others.</p>
147
+    makes Tor users secure. <a href="<wikifaq>#RelayAnonymity">You may
148
+    also get stronger anonymity yourself</a>, since remote sites can't
149
+    know whether connections originated at your computer or were relayed
150
+    from others.</p>
160 151
     
161 152
     <p>Read more at our <a href="<page docs/tor-doc-relay>">Configuring a relay</a>
162 153
     guide.</p>
... ...
@@ -166,11 +157,13 @@
166 157
     <h2><a class="anchor" href="#uninstall">How To Uninstall Tor and Privoxy</a></h2>
167 158
     <br>
168 159
     
169
-    <p>There are two ways to uninstall the bundle from your computer, using
170
-    Finder or a command line or Terminal-based uninstaller.  If you want to remove Tor on OSX, here's how:</p>
160
+    <p>There are two ways to uninstall the bundle from your computer,
161
+    using Finder or a command line or Terminal-based uninstaller.
162
+    If you want to remove Tor on OSX, here's how:</p>
171 163
     
172
-    <p>Change your application proxy settings back to their original values.
173
-       If you just want to stop using Tor, you can end at this point.</p>
164
+    <p>Change your application proxy settings back to their original
165
+    values.  If you just want to stop using Tor, you can end at this
166
+    point.</p>
174 167
     
175 168
     <p>If you want to completely remove Tor, and your account has Admin
176 169
     Privileges, then proceed as follows:</p>