[or-cvs] Updated osx uninstall instructions.

[phobos at seul.org]

Update of /home/or/cvsroot/website/docs/en
In directory moria:/tmp/cvs-serv31361

Modified Files:
	tor-doc-osx.wml 
Log Message:
Updated osx uninstall instructions.


Index: tor-doc-osx.wml
===================================================================
RCS file: /home/or/cvsroot/website/docs/en/tor-doc-osx.wml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -d -r1.14 -r1.15
--- tor-doc-osx.wml	12 Jun 2006 01:04:05 -0000	1.14
+++ tor-doc-osx.wml	6 Jul 2006 17:09:15 -0000	1.15
@@ -208,35 +208,21 @@ guide.</p>
 <h2><a class="anchor" href="#uninstall">How To Uninstall Tor and Privoxy</a></h2>
 <br />
 
-<p>The Tor 0.1.0.x series does not come with an uninstaller; this feature
-  will be added in the 0.1.1.x series.  If you want to remove Tor on OSX,
-  here's how:</p>
+<p>The Tor 0.1.0.x series and beyond have 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>To stop Tor and Privoxy from running on startup, remove the
-   /Library/StartupItems/Tor and /Library/StartupItems/Privoxy directories
-   respectively. If you just want to stop Tor from running, you can end at this
-   point.</p>
-
-<p>To erase all remaining Tor and Privoxy files from your computer, delete
-  the following:
-   <ul>
-   <li>/Library/Tor</li>
-   <li>/Library/Privoxy</li>
-   <li>/usr/bin/tor</li>
-   <li>/usr/bin/tor_resolve</li>
-   <li>/var/log/tor</li>
-   <li>/usr/share/man/man1/tor.1</li>
-   <li>/usr/share/man/man1/tor-resolve.1</li>
-   <li>/usr/share/man/man1/torify.1</li>
-   <li>/Library/Receipts/Privoxy.pkg/</li>
-   <li>/Library/Receipts/privoxyconf.pkg/</li>
-   <li>/Library/Receipts/Tor.pkg/</li>
-   <li>/Library/Receipts/torstartup.pkg/</li>
-  </ul>
-
+<p>If you want to completely remove Tor, and your account has Admin
+Privileges, then proceed as follows:</p>
+<ol>
+<li> Open up a Terminal or x-term session.</li>
+<li> cd /Library/Tor</li>
+<li> sudo -s</li>
+<li> ./uninstall_tor_bundle.sh</li>
+</ol>
+<p>Tor and Privoxy are now completely removed from your system.</p>
 
 <hr />