update tor-doc-osx docs to know about the vidalia bundle.
Roger Dingledine commited on 2006-06-12 02:41:57
Zeige 2 geänderte Dateien mit 16 Einfügungen und 16 Löschungen.
- docs/en/tor-doc-osx.wml b84921612..4e357e6b2
- docs/en/tor-doc-win32.wml 5d01a142f..3b26440ec
| ... | ... |
@@ -24,9 +24,10 @@ |
| 24 | 24 |
|
| 25 | 25 |
<p> |
| 26 | 26 |
The latest stable and experimental releases of Tor for Macintosh |
| 27 |
-OS X bundle <a href="<page index>">Tor</a> and <a |
|
| 28 |
-href="http://www.privoxy.org">Privoxy</a> (a filtering web proxy) |
|
| 29 |
-into one package, with Privoxy pre-configured to proxy through Tor. |
|
| 27 |
+OS X bundle <a href="<page index>">Tor</a>, |
|
| 28 |
+<a href="http://www.vidalia-project.net/">Vidalia</a> (a GUI for Tor), |
|
| 29 |
+and <a href="http://www.privoxy.org/">Privoxy</a> (a filtering web proxy) |
|
| 30 |
+into one package, pre-configured to work together. |
|
| 30 | 31 |
<a href="<page download>">Download one from the download |
| 31 | 32 |
page</a>. |
| 32 | 33 |
</p> |
| ... | ... |
@@ -39,22 +40,22 @@ screenshot of the setup page: |
| 39 | 40 |
src="../img/screenshot-osx-installer-splash.png" |
| 40 | 41 |
border="1"> |
| 41 | 42 |
|
| 42 |
-<p> |
|
| 43 |
-By default, Tor is configured to run at startup. If you do not want Tor to |
|
| 44 |
-run on startup, you can disable this by selecting "Customize" in the |
|
| 45 |
-Installer, and then un-checking the "Tor Startup Script" box. Be sure to |
|
| 46 |
-leave the other boxes checked. |
|
| 43 |
+<p>When the installer is finished, you can start Vidalia by selecting its icon |
|
| 44 |
+from your Applications folder. A dark onion with a red X in your dock means |
|
| 45 |
+Tor is not currently running. You can start Tor by selecting Start from the |
|
| 46 |
+"Tor" menu at the top of your screen. |
|
| 47 |
+</p> |
|
| 48 |
+ |
|
| 49 |
+<p>When Tor is running, Vidalia's dock icon will look like the following: |
|
| 47 | 50 |
</p> |
| 48 | 51 |
|
| 49 |
-<p>Once the installer is finished and your computer restarts, Tor will |
|
| 50 |
-start automatically. Tor comes configured as a client by default. It |
|
| 51 |
-uses a built-in default configuration file in <tt>/Library/Tor/torrc</tt>, |
|
| 52 |
-but most people won't need to change any of the settings. Tor is now |
|
| 53 |
-installed.</p> |
|
| 52 |
+<img alt="vidalia running tor" |
|
| 53 |
+src="../img/screenshot-osx-vidalia.png" |
|
| 54 |
+border="1"> |
|
| 54 | 55 |
|
| 55 | 56 |
<p>Privoxy is installed as part of the Tor bundle package |
| 56 | 57 |
installer. Privoxy is a filtering web proxy that integrates well with |
| 57 |
-Tor. Once it's installed, it will start automatically when your computer |
|
| 58 |
+Tor. Once it is installed, it will start automatically when your computer |
|
| 58 | 59 |
is restarted. |
| 59 | 60 |
</p> |
| 60 | 61 |
|
| ... | ... |
@@ -25,8 +25,7 @@ guide.</b> |
| 25 | 25 |
|
| 26 | 26 |
<p> |
| 27 | 27 |
The install for MS Windows bundles <a href="<page index>">Tor</a>, |
| 28 |
-<a href="http://www.vidalia-project.net/">Vidalia</a> |
|
| 29 |
-(a Tor controller that lets you monitor and control Tor), and <a |
|
| 28 |
+<a href="http://www.vidalia-project.net/">Vidalia</a> (a GUI for Tor), and <a |
|
| 30 | 29 |
href="http://www.privoxy.org">Privoxy</a> (a filtering web proxy) into |
| 31 | 30 |
one package, with the three applications pre-configured to work together. |
| 32 | 31 |
<a href="<page download>">Download <!--either the stable or--> |
| 33 | 32 |