@@ -22,7 +22,7 @@

     <p>Even though Tor Browser comes with a regular Tor, it will only run

     as long as you keep Tor Browser open. The following instructions will

     set up Tor without graphical interface or a browser. Many people prefer

-    this over TBB when they host hidden services or relay traffic for other Tor

+    this over TBB when they host onion services or relay traffic for other Tor

     users.  <hr>

     <a id="installing"></a>

     <h2><a class="anchor" href="#installing">Step One: Install a package manager</a></h2>

@@ -44,7 +44,7 @@

     <h2>Step Two: Install Tor</a></h2>

     <br>

-    <p>If you are using Homebrw in a Terminal window, run:</p>

+    <p>If you are using Homebrew in a Terminal window, run:</p>

     <pre>brew install tor</pre>

@@ -25,7 +25,7 @@

     this over TBB when they host hidden services or relay traffic for other Tor

     users.  <hr>

     <a id="installing"></a>

-    <h2><a class="anchor" href="#installing">Step One: Install A Package Manager</a></h2>

+    <h2><a class="anchor" href="#installing">Step One: Install a package manager</a></h2>

     <br>

     <p>There are two package manager on OS X: Homebrew and Macports. You can use the package manager of your choice.</p>

@@ -102,7 +102,7 @@

     <hr>

     <a id="uninstall"></a>

-    <h2><a class="anchor" href="#uninstall">How To Uninstall Tor</a></h2>

+    <h2><a class="anchor" href="#uninstall">How to uninstall Tor</a></h2>

     <br>

     <p>Change your application proxy settings back to their original

@@ -25,20 +25,34 @@

     this over TBB when they host hidden services or relay traffic for other Tor

     users.  <hr>

     <a id="installing"></a>

-    <h2><a class="anchor" href="#installing">Step One: Install Macports</a></h2>

+    <h2><a class="anchor" href="#installing">Step One: Install A Package Manager</a></h2>

     <br>

+    <p>There are two package manager on OS X: Homebrew and Macports. You can use the package manager of your choice.</p>

+

     <p>

-    Macports is a package manager for Mac OS X which provides a Tor package,

-    along a lot of other stuff. Follow the instructions on <a

-    href="https://www.macports.org/install.php">its Website</a> to install.

+    To install Homebrew follow the instructions on <a

+    href="https://brew.sh/">brew.sh</a>.

+    </p>

+

+    <p>

+    To install Macports follow the instructions on <a

+    href="https://www.macports.org/install.php">macports.org/install.php</a>.

     </p>

     <hr>

     <h2>Step Two: Install Tor</a></h2>

     <br>

-    <p>In a Terminal window, run:</p>

+    <p>If you are using Homebrw in a Terminal window, run:</p>

+

+    <pre>brew install tor</pre>

+

+    <p>You will find a sample Tor configuration file at

+    <tt>/usr/local/etc/tor/torrc.sample</tt>. Remove the .sample extension to

+    make it effective.</p>

+

+    <p>If you are using Macports in a Terminal window, run:</p>

     <pre>sudo port install tor</pre>

@@ -19,8 +19,8 @@

     are done.

     </h2>

-    <p>Even though the Tor Browser comes with a regular Tor, it will only run

-    as long as you keep the Tor Browser open. The following instructions will

+    <p>Even though Tor Browser comes with a regular Tor, it will only run

+    as long as you keep Tor Browser open. The following instructions will

     set up Tor without graphical interface or a browser. Many people prefer

     this over TBB when they host hidden services or relay traffic for other Tor

     users.  <hr>

@@ -19,58 +19,53 @@

     are done.

     </h2>

-    <p>Even though the Tor Browser comes with a regular Tor, and you could use the graphical interface to configure Tor as a relay and bridge easily, it will only run as long as you keep the Tor Browser open. The following instructions will set up Tor without graphical interface or a browser. Many people prefer this over TBB when they host hidden services or relay traffic for other Tor users.

-    <hr>

+    <p>Even though the Tor Browser comes with a regular Tor, it will only run

+    as long as you keep the Tor Browser open. The following instructions will

+    set up Tor without graphical interface or a browser. Many people prefer

+    this over TBB when they host hidden services or relay traffic for other Tor

+    users.  <hr>

     <a id="installing"></a>

-    <h2><a class="anchor" href="#installing">Step One: Install Homebrew</a></h2>

+    <h2><a class="anchor" href="#installing">Step One: Install Macports</a></h2>

     <br>

     <p>

-    The advanced Tor without any graphical user interface can be installed using <a href="http://brew.sh">the Homebrew package manager</a>. It is most suitable if you want to use Tor as a SOCKS proxy for applications other than web browsing, or run a Tor relay/bridge to help other Tor users. If you use the command-line Tor, you might be interested in <a href="<page projects/arm>">arm</a>, a command-line Tor monitor.

+    Macports is a package manager for Mac OS X which provides a Tor package,

+    along a lot of other stuff. Follow the instructions on <a

+    href="https://www.macports.org/install.php">its Website</a> to install.

     </p>

-    <p>If you don't have Homebrew installed, open a terminal window and run:</p>

-

-    <pre>ruby -e "$(curl -fsSkL https://raw.githubusercontent.com/Homebrew/install/master/install)"</pre>

-

     <hr>

     <h2>Step Two: Install Tor</a></h2>

     <br>

-    <p>In a terminal window, run:</p>

+    <p>In a Terminal window, run:</p>

-    <pre>brew install tor</pre>

+    <pre>sudo port install tor</pre>

-    <p>You will find the Tor configuration file at <tt>/usr/local/etc/tor/torrc</tt>.</p>

-

-    <hr>

-    <a id="verify"></a>

-    <h2><a class="anchor" href="#verify">Step Three: Verify your download</a></h2>

-

-    <p>As with any application, you should make sure it came unmodified from the orginal source. Unfortunately, Homebrew does not come with integrated verification for downloads, and anyone could submit a modified Tor! Currently, we don't have good instructions on how to verify the Tor download on Mac OSX. If you think you do, please <a href="<page about/contact>">let us know</a>!</p>

+    <p>You will find a sample Tor configuration file at

+    <tt>/opt/local/etc/tor/torrc.sample</tt>. Remove the .sample extension to

+    make it effective.</p>

     <hr>

     <a id="using"></a>

-    <h2><a class="anchor" href="#using">Step Four: Configure your application to use Tor</a></h2>

+    <h2><a class="anchor" href="#using">Step Three: Configure your application to use Tor</a></h2>

     <p>

-    If you want to use Tor for anonymous web browsing, please use the <a href="<page projects/torbrowser>">Tor Browser</a>. It comes with readily configured Tor and a browser patched for better anonymity. To use SOCKS directly (for instant messaging, Jabber, IRC, etc),

-    you can point your application directly at Tor (localhost

-    port 9050), but see <a href="<wikifaq>#SOCKSAndDNS">this FAQ

-    entry</a> for why this may be dangerous. For applications

-    that support neither SOCKS nor HTTP, take a look at <a

-    href="http://www.dest-unreach.org/socat/">socat</a>.</p>

+    To use SOCKS directly (for instant messaging, Jabber, IRC, etc), you can

+    point your application directly at Tor (localhost port 9050), but see <a

+    href="<wikifaq>#SOCKSAndDNS">this FAQ entry</a> for why this may be

+    dangerous. For applications that support neither SOCKS nor HTTP, take a

+    look at <a href="http://www.dest-unreach.org/socat/">socat</a>.</p>

     <p>For information on how to Torify other applications, check out the

     <a href="<wiki>doc/TorifyHOWTO">Torify HOWTO</a>.

     </p>

-    <p>If you have a personal firewall that limits your computer's

-    ability to connect to itself, be sure to allow connections from

-    your local applications to local port 9050. If your

-    firewall blocks outgoing connections, punch a hole so it can

-    connect to at least TCP ports 80 and 443, and then see <a

-    href="<wikifaq>#FirewalledClient">this FAQ entry</a>.

+    <p>If you have a personal firewall that limits your computer's ability to

+    connect to itself, be sure to allow connections from your local

+    applications to local port 9050. If your firewall blocks outgoing

+    connections, punch a hole so it can connect to at least TCP ports 80 and

+    443, and then see <a href="<wikifaq>#FirewalledClient">this FAQ entry</a>.

     </p>

     <p>If it's still not working, look at <a

@@ -100,21 +95,10 @@

     values.  If you just want to stop using Tor, you can end at this

     point.</p>

-    <p>If you want to completely remove Tor, and your account has Admin

-    Privileges, then proceed as follows:</p>

-

-    <ol>

-    <li>Open Finder and click on Applications.</li>

-    <li>Drag /Applications/TorBrowser to the Trash.</li>

-    <li>Remove /Library/Torbutton from your system.</li>

-    </ol>

+    <p>If you want to completely remove Tor, type into a Terminal window:</p>

-    <p>Tor Browser is now completely removed from your system.</p>

-

-    <hr>

+    <pre>sudo port uninstall tor</pre>

-    <p>If you have suggestions for improving this document, please <a

-    href="<page about/contact>">send them to us</a>. Thanks!</p>

   </div>

   <!-- END MAINCOL -->

   <div id = "sidecol">

@@ -8,51 +8,51 @@

     <a href="<page index>">Home &raquo; </a>

     <a href="<page docs/documentation>">Documentation &raquo; </a>

     <a href="<page docs/tor-doc-osx>">Mac OS X Client</a>

-  </div> 

+  </div>

   <div id="maincol">

     <h1>Running Tor on Mac OS X</h1>

     <br>

-    

+

     <h2>These are advanced installation instructions for running

     Tor in a command line. The recommended way to use Tor is to simply download the

     <a href="<page projects/torbrowser>">Tor Browser</a> and you

     are done.

     </h2>

-    

-    <p>Even though the Tor Browser comes with a regular Tor, and you could use the graphical interface to configure Tor as a relay and bridge easily, it will only run as long as you keep the Tor Browser open. The following instructions will set up Tor without graphical interface or a browser. Many people prefer this over TBB when they host hidden services or relay traffic for other Tor users. 

+

+    <p>Even though the Tor Browser comes with a regular Tor, and you could use the graphical interface to configure Tor as a relay and bridge easily, it will only run as long as you keep the Tor Browser open. The following instructions will set up Tor without graphical interface or a browser. Many people prefer this over TBB when they host hidden services or relay traffic for other Tor users.

     <hr>

     <a id="installing"></a>

     <h2><a class="anchor" href="#installing">Step One: Install Homebrew</a></h2>

     <br>

-    

+

     <p>

     The advanced Tor without any graphical user interface can be installed using <a href="http://brew.sh">the Homebrew package manager</a>. It is most suitable if you want to use Tor as a SOCKS proxy for applications other than web browsing, or run a Tor relay/bridge to help other Tor users. If you use the command-line Tor, you might be interested in <a href="<page projects/arm>">arm</a>, a command-line Tor monitor.

     </p>

-    

+

     <p>If you don't have Homebrew installed, open a terminal window and run:</p>

- 

+

     <pre>ruby -e "$(curl -fsSkL https://raw.githubusercontent.com/Homebrew/install/master/install)"</pre>

-    

+

     <hr>

     <h2>Step Two: Install Tor</a></h2>

     <br>

-    

+

     <p>In a terminal window, run:</p>

     <pre>brew install tor</pre>

- 

+

     <p>You will find the Tor configuration file at <tt>/usr/local/etc/tor/torrc</tt>.</p>

- 

+

     <hr>

     <a id="verify"></a>

     <h2><a class="anchor" href="#verify">Step Three: Verify your download</a></h2>

-  

+

     <p>As with any application, you should make sure it came unmodified from the orginal source. Unfortunately, Homebrew does not come with integrated verification for downloads, and anyone could submit a modified Tor! Currently, we don't have good instructions on how to verify the Tor download on Mac OSX. If you think you do, please <a href="<page about/contact>">let us know</a>!</p>

     <hr>

-    <a id="using"></a> 

+    <a id="using"></a>

     <h2><a class="anchor" href="#using">Step Four: Configure your application to use Tor</a></h2>

-    

+

     <p>

     If you want to use Tor for anonymous web browsing, please use the <a href="<page projects/torbrowser>">Tor Browser</a>. It comes with readily configured Tor and a browser patched for better anonymity. To use SOCKS directly (for instant messaging, Jabber, IRC, etc),

     you can point your application directly at Tor (localhost

@@ -60,11 +60,11 @@

     entry</a> for why this may be dangerous. For applications

     that support neither SOCKS nor HTTP, take a look at <a

     href="http://www.dest-unreach.org/socat/">socat</a>.</p>

-    

+

     <p>For information on how to Torify other applications, check out the

     <a href="<wiki>doc/TorifyHOWTO">Torify HOWTO</a>.

     </p>

-    

+

     <p>If you have a personal firewall that limits your computer's

     ability to connect to itself, be sure to allow connections from

     your local applications to local port 9050. If your

@@ -72,25 +72,25 @@

     connect to at least TCP ports 80 and 443, and then see <a

     href="<wikifaq>#FirewalledClient">this FAQ entry</a>.

     </p>

-    

+

     <p>If it's still not working, look at <a

     href="<page docs/faq>#DoesntWork">this FAQ entry</a> for hints.</p>

-    

+

     <p>

     Once it's working, learn more about <a href="<page

     download/download>#Warning">what Tor does and does not offer</a>.

     </p>

-    

+

     <hr>

     <a id="server"></a>

     <a id="relay"></a>

     <h2><a class="anchor" href="#relay">Configure Tor as a relay</a></h2>

     <br>

-    

+

     <p>The Tor network relies on volunteers to donate bandwidth. If you

     want to help <strong>make the Tor network faster</strong>, please

     consider <a href="<page docs/tor-doc-relay>">running a relay</a>.</p>

-    

+

     <hr>

     <a id="uninstall"></a>

     <h2><a class="anchor" href="#uninstall">How To Uninstall Tor</a></h2>

@@ -99,20 +99,20 @@

     <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>If you want to completely remove Tor, and your account has Admin

     Privileges, then proceed as follows:</p>

-    

+

     <ol>

     <li>Open Finder and click on Applications.</li>

     <li>Drag /Applications/TorBrowser to the Trash.</li>

     <li>Remove /Library/Torbutton from your system.</li>

     </ol>

-    

+

     <p>Tor Browser is now completely removed from your system.</p>

-    

+

     <hr>

-    

+

     <p>If you have suggestions for improving this document, please <a

     href="<page about/contact>">send them to us</a>. Thanks!</p>

   </div>

@@ -124,4 +124,4 @@

   <!-- END SIDECOL -->

 </div>

 <!-- END CONTENT -->

-#include <foot.wmi>  

+#include <foot.wmi>

@@ -15,11 +15,11 @@

     <h2>These are advanced installation instructions for running

     Tor in a command line. The recommended way to use Tor is to simply download the

-    <a href="<page projects/torbrowser>">Tor Browser Bundle</a> and you

+    <a href="<page projects/torbrowser>">Tor Browser</a> and you

     are done.

     </h2>

-    <p>Even though the Tor Browser Bundle comes with a regular Tor, and you could use the graphical interface to configure Tor as a relay and bridge easily, it will only run as long as you keep the Tor Browser open. The following instructions will set up Tor without graphical interface or a browser. Many people prefer this over TBB when they host hidden services or relay traffic for other Tor users. 

+    <p>Even though the Tor Browser comes with a regular Tor, and you could use the graphical interface to configure Tor as a relay and bridge easily, it will only run as long as you keep the Tor Browser open. The following instructions will set up Tor without graphical interface or a browser. Many people prefer this over TBB when they host hidden services or relay traffic for other Tor users. 

     <hr>

     <a id="installing"></a>

     <h2><a class="anchor" href="#installing">Step One: Install Homebrew</a></h2>

@@ -54,7 +54,7 @@

     <h2><a class="anchor" href="#using">Step Four: Configure your application to use Tor</a></h2>

     <p>

-    If you want to use Tor for anonymous web browsing, please use the <a href="<page projects/torbrowser>">Tor Browser Bundle</a>. It comes with readily configured Tor and a browser patched for better anonymity. To use SOCKS directly (for instant messaging, Jabber, IRC, etc),

+    If you want to use Tor for anonymous web browsing, please use the <a href="<page projects/torbrowser>">Tor Browser</a>. It comes with readily configured Tor and a browser patched for better anonymity. To use SOCKS directly (for instant messaging, Jabber, IRC, etc),

     you can point your application directly at Tor (localhost

     port 9050), but see <a href="<wikifaq>#SOCKSAndDNS">this FAQ

     entry</a> for why this may be dangerous. For applications

@@ -87,22 +87,9 @@

     <h2><a class="anchor" href="#relay">Configure Tor as a relay</a></h2>

     <br>

-    <p>The Tor network relies on volunteers to donate bandwidth. The more

-    people who run relays, the faster the Tor network will be. If you have

-    at least 50 kilobytes/s each way, please help out Tor by configuring your

-    Tor to be a relay too. We have many features that make Tor relays easy

-    and convenient, including rate limiting for bandwidth, exit policies so

-    you can limit your exposure to abuse complaints, and support for dynamic

-    IP addresses.</p>

-    

-    <p>Having relays in many different places on the Internet is what

-    makes Tor users secure. <a href="<wikifaq>#RelayAnonymity">You may

-    also get stronger anonymity yourself</a>, since remote sites can't

-    know whether connections originated at your computer or were relayed

-    from others.</p>

-    

-    <p>Read more at our <a href="<page docs/tor-doc-relay>">Configuring a relay</a>

-    guide.</p>

+    <p>The Tor network relies on volunteers to donate bandwidth. If you

+    want to help <strong>make the Tor network faster</strong>, please

+    consider <a href="<page docs/tor-doc-relay>">running a relay</a>.</p>

     <hr>

     <a id="uninstall"></a>

@@ -26,7 +26,7 @@

     <br>

     <p>

-    The advanced Tor without any graphical user interface can be installed using <a href="http://brew.sh">the Homebrew package manager</a>. It is most suitable if you want to use Tor as a SOCKS proxy for applications other than web browsing, or run a Tor relay/bridge to help other Tor users. If you use the command-line Tor, you might be interested in <a href="<page projects/arm>">arm</a>, a command-line Tor monitor and alternative to the Vidalia GUI.

+    The advanced Tor without any graphical user interface can be installed using <a href="http://brew.sh">the Homebrew package manager</a>. It is most suitable if you want to use Tor as a SOCKS proxy for applications other than web browsing, or run a Tor relay/bridge to help other Tor users. If you use the command-line Tor, you might be interested in <a href="<page projects/arm>">arm</a>, a command-line Tor monitor.

     </p>

     <p>If you don't have Homebrew installed, open a terminal window and run:</p>

@@ -120,8 +120,6 @@

     <li>Open Finder and click on Applications.</li>

     <li>Drag /Applications/TorBrowser to the Trash.</li>

     <li>Remove /Library/Torbutton from your system.</li>

-    <li>In your User or home directory, go to Library, remove the Vidalia

-    directory</li>

     </ol>

     <p>Tor Browser is now completely removed from your system.</p>

@@ -31,7 +31,7 @@

     <p>If you don't have Homebrew installed, open a terminal window and run:</p>

-    <pre>ruby -e "$(curl -fsSkL https://raw.github.com/Homebrew/homebrew/go/install)"</pre>

+    <pre>ruby -e "$(curl -fsSkL https://raw.githubusercontent.com/Homebrew/install/master/install)"</pre>

     <hr>

     <h2>Step Two: Install Tor</a></h2>

@@ -26,7 +26,7 @@

     <br>

     <p>

-    The advanced Tor without any graphical user interface can be installed using <a href="http://mxcl.github.com/homebrew">the Homebrew package manager</a>. It is most suitable if you want to use Tor as a SOCKS proxy for applications other than web browsing, or run a Tor relay/bridge to help other Tor users. If you use the command-line Tor, you might be interested in <a href="<page projects/arm>">arm</a>, a command-line Tor monitor and alternative to the Vidalia GUI.

+    The advanced Tor without any graphical user interface can be installed using <a href="http://brew.sh">the Homebrew package manager</a>. It is most suitable if you want to use Tor as a SOCKS proxy for applications other than web browsing, or run a Tor relay/bridge to help other Tor users. If you use the command-line Tor, you might be interested in <a href="<page projects/arm>">arm</a>, a command-line Tor monitor and alternative to the Vidalia GUI.

     </p>

     <p>If you don't have Homebrew installed, open a terminal window and run:</p>

@@ -31,7 +31,7 @@

     <p>If you don't have Homebrew installed, open a terminal window and run:</p>

-    <pre>ruby -e "$(curl -fsSkL raw.github.com/mxcl/homebrew/go)"</pre>

+    <pre>ruby -e "$(curl -fsSkL https://raw.github.com/Homebrew/homebrew/go/install)"</pre>

     <hr>

     <h2>Step Two: Install Tor</a></h2>

@@ -89,7 +89,7 @@

     <p>The Tor network relies on volunteers to donate bandwidth. The more

     people who run relays, the faster the Tor network will be. If you have

-    at least 20 kilobytes/s each way, please help out Tor by configuring your

+    at least 50 kilobytes/s each way, please help out Tor by configuring your

     Tor to be a relay too. We have many features that make Tor relays easy

     and convenient, including rate limiting for bandwidth, exit policies so

     you can limit your exposure to abuse complaints, and support for dynamic

@@ -26,7 +26,7 @@

     <br>

     <p>

-    The advanced Tor without any graphical user interface can be installed using <a href="http://mxcl.github.com/homebrew">the Homebrew package manager</a>. It is most suitable if you want to use Tor as a SOCKS proxy for applications other than web browsing, or run a Tor relay/bridge to help other Tor users. If you use the command-line Tor, you might be interested in <a href="<page projects/arm>">arm</a>, a command-line Tor monitor and alternative to the Vidalia GUI.. 

+    The advanced Tor without any graphical user interface can be installed using <a href="http://mxcl.github.com/homebrew">the Homebrew package manager</a>. It is most suitable if you want to use Tor as a SOCKS proxy for applications other than web browsing, or run a Tor relay/bridge to help other Tor users. If you use the command-line Tor, you might be interested in <a href="<page projects/arm>">arm</a>, a command-line Tor monitor and alternative to the Vidalia GUI.

     </p>

     <p>If you don't have Homebrew installed, open a terminal window and run:</p>

@@ -26,7 +26,7 @@

     <br>

     <p>

-    The advanced Tor without any graphical user interface can be installed using <a href="http://mxcl.github.com/homebrew">the Homebrew package manager</a>. It is most suitable if you want to use Tor as a SOCKS proxy for applications other than web browsing, or run a Tor relay/bridge to help other Tor users. If you use the command-line Tor, you might be interested in <a href="<page projects/arm">ARM</a>, a command-line Tor monitor and alternative to the Vidalia GUI.. 

+    The advanced Tor without any graphical user interface can be installed using <a href="http://mxcl.github.com/homebrew">the Homebrew package manager</a>. It is most suitable if you want to use Tor as a SOCKS proxy for applications other than web browsing, or run a Tor relay/bridge to help other Tor users. If you use the command-line Tor, you might be interested in <a href="<page projects/arm>">arm</a>, a command-line Tor monitor and alternative to the Vidalia GUI.. 

     </p>

     <p>If you don't have Homebrew installed, open a terminal window and run:</p>

@@ -10,69 +10,51 @@

     <a href="<page docs/tor-doc-osx>">Mac OS X Client</a>

   </div> 

   <div id="maincol">

-    <h1>Running the Tor client on Mac OS X</h1>

+    <h1>Running Tor on Mac OS X</h1>

     <br>

-    <h2>Note that these are the installation instructions for running

-    a Tor client. The easiest way to do this is to simply download the

+    <h2>These are advanced installation instructions for running

+    Tor in a command line. The recommended way to use Tor is to simply download the

     <a href="<page projects/torbrowser>">Tor Browser Bundle</a> and you

     are done.

     </h2>

+    <p>Even though the Tor Browser Bundle comes with a regular Tor, and you could use the graphical interface to configure Tor as a relay and bridge easily, it will only run as long as you keep the Tor Browser open. The following instructions will set up Tor without graphical interface or a browser. Many people prefer this over TBB when they host hidden services or relay traffic for other Tor users. 

     <hr>

     <a id="installing"></a>

-    <h2><a class="anchor" href="#installing">Step One: Download and Install Tor</a></h2>

+    <h2><a class="anchor" href="#installing">Step One: Install Homebrew</a></h2>

     <br>

     <p>

-    The install for Macintosh OS X bundles <a href="<page index>">Tor</a>,

-    <a href="<page projects/vidalia>">Vidalia</a> (a graphical interface

-    for Tor), <a href="<page torbutton/index>">Torbutton</a>, into one

-    package, with the three applications pre-configured to work together.

-    Download either the <a href="<page download/download>#mac">stable</a>

-    or the <a href="<page download/download>#mac">experimental</a>

-    version of the OS X bundle, or look for more options on the <a

-    href="<page download/download>">download page</a>.

+    The advanced Tor without any graphical user interface can be installed using <a href="http://mxcl.github.com/homebrew">the Homebrew package manager</a>. It is most suitable if you want to use Tor as a SOCKS proxy for applications other than web browsing, or run a Tor relay/bridge to help other Tor users. If you use the command-line Tor, you might be interested in <a href="<page projects/arm">ARM</a>, a command-line Tor monitor and alternative to the Vidalia GUI.. 

     </p>

-    <p>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.</p>

-    

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

-    </p>

-    

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

-    </p>

-    

-    <p><img alt="vidalia running tor"

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

+    <p>If you don't have Homebrew installed, open a terminal window and run:</p>

+ 

+    <pre>ruby -e "$(curl -fsSkL raw.github.com/mxcl/homebrew/go)"</pre>

     <hr>

-    <a id="using"></a>

-    <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>

+    <h2>Step Two: Install Tor</a></h2>

     <br>

-    <p>After installing, you need to configure your applications to use

-    them. The first step is to set up web browsing.</p>

-    

-    <p>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: </p>

-    

-    <p><img alt="Torbutton plugin for Firefox"

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

-    

-    <p> If you plan to run Firefox on a different computer than Tor,

-    see the <a href="<wikifaq>#SocksListenAddress">FAQ entry for running

-    Tor on a different computer</a>.  </p>

+    <p>In a terminal window, run:</p>

+

+    <pre>brew install tor</pre>

+ 

+    <p>You will find the Tor configuration file at <tt>/usr/local/etc/tor/torrc</tt>.</p>

+ 

+    <hr>

+    <a id="verify"></a>

+    <h2><a class="anchor" href="#verify">Step Three: Verify your download</a></h2>

+  

+    <p>As with any application, you should make sure it came unmodified from the orginal source. Unfortunately, Homebrew does not come with integrated verification for downloads, and anyone could submit a modified Tor! Currently, we don't have good instructions on how to verify the Tor download on Mac OSX. If you think you do, please <a href="<page about/contact>">let us know</a>!</p>

+

+    <hr>

+    <a id="using"></a> 

+    <h2><a class="anchor" href="#using">Step Four: Configure your application to use Tor</a></h2>

-    <p>To use SOCKS directly (for instant messaging, Jabber, IRC, etc),

+    <p>

+    If you want to use Tor for anonymous web browsing, please use the <a href="<page projects/torbrowser>">Tor Browser Bundle</a>. It comes with readily configured Tor and a browser patched for better anonymity. To use SOCKS directly (for instant messaging, Jabber, IRC, etc),

     you can point your application directly at Tor (localhost

     port 9050), but see <a href="<wikifaq>#SOCKSAndDNS">this FAQ

     entry</a> for why this may be dangerous. For applications

@@ -83,20 +65,6 @@

     <a href="<wiki>doc/TorifyHOWTO">Torify HOWTO</a>.

     </p>

-    <hr>

-    <a id="verify"></a>

-    <h2><a class="anchor" href="#verify">Step Three: Make sure it's working</a></h2>

-    <br>

-    

-    <p>

-    Next, you should try using your browser with Tor and make

-    sure that your IP address is being anonymized. Click on <a

-    href="https://check.torproject.org/">the Tor detector</a> and see

-    whether it thinks you're using Tor or not.  (If that site is down,

-    see <a href="<wikifaq>#IsMyConnectionPrivate">this FAQ entry</a>

-    for more suggestions on how to test your Tor.)

-    </p>

-    

     <p>If you have a personal firewall that limits your computer's

     ability to connect to itself, be sure to allow connections from

     your local applications to local port 9050. If your

@@ -116,7 +84,7 @@

     <hr>

     <a id="server"></a>

     <a id="relay"></a>

-    <h2><a class="anchor" href="#relay">Step Four: Configure it as a relay</a></h2>

+    <h2><a class="anchor" href="#relay">Configure Tor as a relay</a></h2>

     <br>

     <p>The Tor network relies on volunteers to donate bandwidth. The more

@@ -138,13 +106,9 @@

     <hr>

     <a id="uninstall"></a>

-    <h2><a class="anchor" href="#uninstall">How To Uninstall Tor and Polipo</a></h2>

+    <h2><a class="anchor" href="#uninstall">How To Uninstall Tor</a></h2>

     <br>

-    

-    <p>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:</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>

@@ -154,22 +118,13 @@

     <ol>

     <li>Open Finder and click on Applications.</li>

-    <li>Drag /Applications/Vidalia to the Trash.</li>

+    <li>Drag /Applications/TorBrowser to the Trash.</li>

     <li>Remove /Library/Torbutton from your system.</li>

     <li>In your User or home directory, go to Library, remove the Vidalia

     directory</li>

     </ol>

-    <p>Tor and Vidalia are now completely removed from your system.</p>

-    

-    <p>If you're familiar with the command line or Terminal, you can

-    manually type the following:</p>

-    <ul>

-    <li>rm -r /Applications/Vidalia.app</li>

-    <li>rm -r /Library/Torbutton</li>

-    <li>rm -r ~/Library/Vidalia</li>

-    <li>rm -r ~/.tor</li>

-    </ul>

+    <p>Tor Browser is now completely removed from your system.</p>

     <hr>

@@ -25,25 +25,21 @@

     <br>

     <p>

-    The install for Macintosh OS X bundles

-    <a href="<page index>">Tor</a>,

-    <a href="<page projects/vidalia>">Vidalia</a> (a graphical interface for Tor),

-    <a href="<page torbutton/index>">Torbutton</a>,

-    and <a href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a> (a web proxy)

-    into one package, with the four applications pre-configured to work

-    together.

+    The install for Macintosh OS X bundles <a href="<page index>">Tor</a>,

+    <a href="<page projects/vidalia>">Vidalia</a> (a graphical interface

+    for Tor), <a href="<page torbutton/index>">Torbutton</a>, into one

+    package, with the three applications pre-configured to work together.

     Download either the <a href="<page download/download>#mac">stable</a>

-    or the <a href="<page download/download>#mac">experimental</a> version

-    of the OS X bundle, or look for more options on the <a href="<page

-    download/download>">download page</a>.

+    or the <a href="<page download/download>#mac">experimental</a>

+    version of the OS X bundle, or look for more options on the <a

+    href="<page download/download>">download page</a>.

     </p>

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

+    script and let it install torbutton into Firefox.</p>

     <p>When you are finished installing, you can start Vidalia by

     selecting its icon from your Applications folder. A dark onion with a

@@ -57,13 +53,6 @@

     <p><img alt="vidalia running tor"

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

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

-    </p>

-    

     <hr>

     <a id="using"></a>

     <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>

@@ -83,9 +72,7 @@

     see the <a href="<wikifaq>#SocksListenAddress">FAQ entry for running

     Tor on a different computer</a>.  </p>

-    <p>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),

+    <p>To use SOCKS directly (for instant messaging, Jabber, IRC, etc),

     you can point your application directly at Tor (localhost

     port 9050), but see <a href="<wikifaq>#SOCKSAndDNS">this FAQ

     entry</a> for why this may be dangerous. For applications

@@ -112,11 +99,10 @@

     <p>If you have a personal firewall that limits your computer's

     ability to connect to itself, be sure to allow connections from

-    your local applications to local port 8118 and port 9050. If

-    your firewall blocks outgoing connections, punch a hole so

-    it can connect to at least TCP ports 80 and 443, and then see <a

-    href="<wikifaq>#FirewalledClient">this

-    FAQ entry</a>.

+    your local applications to local port 9050. If your

+    firewall blocks outgoing connections, punch a hole so it can

+    connect to at least TCP ports 80 and 443, and then see <a

+    href="<wikifaq>#FirewalledClient">this FAQ entry</a>.

     </p>

     <p>If it's still not working, look at <a

@@ -174,7 +160,7 @@

     directory</li>

     </ol>

-    <p>Tor, Vidalia, and Polipo are now completely removed from your system.</p>

+    <p>Tor and Vidalia are now completely removed from your system.</p>

     <p>If you're familiar with the command line or Terminal, you can

     manually type the following:</p>

@@ -10,15 +10,14 @@

     <a href="<page docs/tor-doc-osx>">Mac OS X Client</a>

   </div> 

   <div id="maincol">

-    <h1>Running the <a href="<page index>">Tor</a> client on Mac OS X</h1>

+    <h1>Running the Tor client on Mac OS X</h1>

     <br>

-    <p>

-    <b>Note that these are the installation instructions for running a Tor client on

-      Mac OS X. If you want to relay traffic for others to help the network

-      grow (please do), read the <a

-      href="<page docs/tor-doc-relay>">Configuring a relay</a> guide.</b>

-    </p>

+    <h2>Note that these are the installation instructions for running

+    a Tor client. The easiest way to do this is to simply download the

+    <a href="<page projects/torbrowser>">Tor Browser Bundle</a> and you

+    are done.

+    </h2>

     <hr>

     <a id="installing"></a>

@@ -91,8 +91,7 @@

     port 9050), but see <a href="<wikifaq>#SOCKSAndDNS">this FAQ

     entry</a> for why this may be dangerous. For applications

     that support neither SOCKS nor HTTP, take a look at <a

-    href="http://www.taiyo.co.jp/~gotoh/ssh/connect.html">connect</a>

-    or <a href="http://www.dest-unreach.org/socat/">socat</a>.</p>

+    href="http://www.dest-unreach.org/socat/">socat</a>.</p>

     <p>For information on how to Torify other applications, check out the

     <a href="<wiki>doc/TorifyHOWTO">Torify HOWTO</a>.

@@ -95,7 +95,7 @@

     or <a href="http://www.dest-unreach.org/socat/">socat</a>.</p>

     <p>For information on how to Torify other applications, check out the

-    <a href="<wiki>/TheOnionRouter/TorifyHOWTO">Torify HOWTO</a>.

+    <a href="<wiki>doc/TorifyHOWTO">Torify HOWTO</a>.

     </p>

     <hr>

@@ -33,8 +33,8 @@

     and <a href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a> (a web proxy)

     into one package, with the four applications pre-configured to work

     together.

-    Download either the <a href="<page download/download>#tor">stable</a>

-    or the <a href="<page download/download>#tor">experimental</a> version

+    Download either the <a href="<page download/download>#mac">stable</a>

+    or the <a href="<page download/download>#mac">experimental</a> version

     of the OS X bundle, or look for more options on the <a href="<page

     download/download>">download page</a>.

     </p>

@@ -122,7 +122,7 @@

     </p>

     <p>If it's still not working, look at <a

-    href="<wikifaq>#ItDoesntWork">this FAQ entry</a> for hints.</p>

+    href="<page docs/faq>#DoesntWork">this FAQ entry</a> for hints.</p>

     <p>

     Once it's working, learn more about <a href="<page

@@ -172,19 +172,19 @@

     <li>Open Finder and click on Applications.</li>

     <li>Drag /Applications/Vidalia to the Trash.</li>

     <li>Remove /Library/Torbutton from your system.</li>

-    <li>In your home directory, go to Library, remove the Vidalia

+    <li>In your User or home directory, go to Library, remove the Vidalia

     directory</li>

     </ol>

     <p>Tor, Vidalia, and Polipo are now completely removed from your system.</p>

     <p>If you're familiar with the command line or Terminal, you can

-    manually remove the following:</p>

+    manually type the following:</p>

     <ul>

-    <li>/Applications/Vidalia.app/</li>

-    <li>/Library/Torbutton/</li>

-    <li>~/Library/Vidalia</li>

-    <li>~/.tor</li>

+    <li>rm -r /Applications/Vidalia.app</li>

+    <li>rm -r /Library/Torbutton</li>

+    <li>rm -r ~/Library/Vidalia</li>

+    <li>rm -r ~/.tor</li>

     </ul>

     <hr>

@@ -1,5 +1,5 @@

 ## translation metadata

-# Revision: $Revision: 22305 $

+# Revision: $Revision$

 # Translation-Priority: 2-medium

 #include "head.wmi" TITLE="Tor Project: Mac OS X Install Instructions" CHARSET="UTF-8"

@@ -154,7 +154,7 @@

     <hr>

     <a id="uninstall"></a>

-    <h2><a class="anchor" href="#uninstall">How To Uninstall Tor and Privoxy</a></h2>

+    <h2><a class="anchor" href="#uninstall">How To Uninstall Tor and Polipo</a></h2>

     <br>

     <p>There are two ways to uninstall the bundle from your computer,

@@ -33,37 +33,36 @@

     and <a href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a> (a web proxy)

     into one package, with the four applications pre-configured to work

     together.

-    Download either the <a href="../<package-osx-bundle-stable>">stable</a>

-    or the <a href="../<package-osx-bundle-alpha>">experimental</a> version

-    of the OS X bundle for Intel, or look for more options on the <a href="<page

+    Download either the <a href="<page download/download>#tor">stable</a>

+    or the <a href="<page download/download>#tor">experimental</a> version

+    of the OS X bundle, or look for more options on the <a href="<page

     download/download>">download page</a>.

     </p>