[or-cvs] update tor-doc-osx docs to know about the vidalia bundle.

[arma at seul.org]

Update of /home2/or/cvsroot/website/docs/en
In directory moria:/home/arma/work/onion/cvs/website/docs/en

Modified Files:
	tor-doc-osx.wml tor-doc-win32.wml 
Log Message:
update tor-doc-osx docs to know about the vidalia bundle.


Index: tor-doc-osx.wml
===================================================================
RCS file: /home2/or/cvsroot/website/docs/en/tor-doc-osx.wml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -d -r1.12 -r1.13
--- tor-doc-osx.wml	22 Apr 2006 14:25:23 -0000	1.12
+++ tor-doc-osx.wml	12 Jun 2006 00:41:57 -0000	1.13
@@ -24,9 +24,10 @@
 
 <p>
 The latest stable and experimental releases of Tor for Macintosh
-OS X bundle <a href="<page index>">Tor</a> and <a
-href="http://www.privoxy.org">Privoxy</a> (a filtering web proxy)
-into one package, with Privoxy pre-configured to proxy through Tor.
+OS X bundle <a href="<page index>">Tor</a>,
+<a href="http://www.vidalia-project.net/">Vidalia</a> (a GUI for Tor),
+and <a href="http://www.privoxy.org/">Privoxy</a> (a filtering web proxy)
+into one package, pre-configured to work together.
 <a href="<page download>">Download one from the download
 page</a>.
 </p>
@@ -39,22 +40,22 @@ screenshot of the setup page:
 src="../img/screenshot-osx-installer-splash.png"
 border="1">
 
-<p>
-By default, Tor is configured to run at startup.  If you do not want Tor to
-run on startup, you can disable this by selecting "Customize" in the
-Installer, and then un-checking the "Tor Startup Script" box. Be sure to
-leave the other boxes checked.
+<p>When the installer is finished, 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>Once the installer is finished and your computer restarts, Tor will
-start automatically.  Tor comes configured as a client by default. It
-uses a built-in default configuration file in <tt>/Library/Tor/torrc</tt>,
-but most people won't need to change any of the settings. Tor is now
-installed.</p>
+<p>When Tor is running, Vidalia's dock icon will look like the following:
+</p>
+
+<img alt="vidalia running tor"
+src="../img/screenshot-osx-vidalia.png"
+border="1">
 
 <p>Privoxy is installed as part of the Tor bundle package
 installer. Privoxy is a filtering web proxy that integrates well with
-Tor. Once it's installed, it will start automatically when your computer
+Tor. Once it is installed, it will start automatically when your computer
 is restarted.
 </p>
 

Index: tor-doc-win32.wml
===================================================================
RCS file: /home2/or/cvsroot/website/docs/en/tor-doc-win32.wml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -d -r1.11 -r1.12
--- tor-doc-win32.wml	24 May 2006 00:39:03 -0000	1.11
+++ tor-doc-win32.wml	12 Jun 2006 00:41:57 -0000	1.12
@@ -25,8 +25,7 @@ guide.</b>
 
 <p>
 The install for MS Windows bundles <a href="<page index>">Tor</a>,
-<a href="http://www.vidalia-project.net/">Vidalia</a>
-(a Tor controller that lets you monitor and control Tor), and <a
+<a href="http://www.vidalia-project.net/">Vidalia</a> (a GUI for Tor), and <a
 href="http://www.privoxy.org">Privoxy</a> (a filtering web proxy) into
 one package, with the three applications pre-configured to work together.
 <a href="<page download>">Download <!--either the stable or-->