Merge lp:~marcoceppi/juju-core/mac-osx-instruction-updates into lp:juju-core/docs

[Marco Ceppi]

Fixes to Mac OSX instructions for Charm Tools and Juju

[Jorge Castro (jorge)]

We're going to readd this information in a source tab instead.

review: Approve

=== modified file 'htmldocs/getting-started.html'
--- htmldocs/getting-started.html	2013-10-10 01:00:24 +0000
+++ htmldocs/getting-started.html	2013-10-10 20:22:03 +0000
@@ -101,9 +101,10 @@
                   <div data-section="macosx">
                     <p>Juju is in <a href="http://brew.sh/">Homebrew</a>, to install do:</p>
                     <pre class="prettyprint lang-bash">brew install juju</pre>
-
-                    <p>You can grab the latest pre-relase OSX client from our <a href="https://github.com/juju/juju-core/releases">Github Page</a>. Uncompress the tarball, then you can run the <code>juju</code> command from the terminal. We're in the process of testing these builds to be production ready, so if you have a problem please <a href="https://bugs.launchpad.net/juju-core/+filebug">file a bug</a>.</p>
-                    
+                    <!--
+                    <hr>
+                    <h2>Building from source</h2>
+                    <p class="note"><strong>Note:</strong> The following are for installing juju-core from source and are not required for normal users</p>
                     <p>If you have go installed you can install juju using go get. You can install go via homebrew you'll need bzr too:</p>
                     <pre class="prettyprint lang-yaml">
 brew install go bzr
@@ -115,6 +116,7 @@
 go get -v launchpad.net/juju-core/...
 export PATH=$PATH:$GOPATH/bin</pre>
                     <p>be sure to add your go bin dir to your path permanently by adding it to your .bashrc</p>
+                    -->
                   </div>
                   <div data-section="windows">
                     <p>Download and run the <a href="https://juju.ubuntu.com/install">Juju windows installer from here.</a></p>

=== modified file 'htmldocs/tools-charm-tools.html'
--- htmldocs/tools-charm-tools.html	2013-10-10 01:00:24 +0000
+++ htmldocs/tools-charm-tools.html	2013-10-10 20:22:03 +0000
@@ -78,6 +78,7 @@
               <section class="code-example code-overflow">
                 <nav class="control">
                   <a href="." class="selected" data-action="ubuntu">Ubuntu</a>
+                  <a href="." class="" data-action="osx">Mac OSX</a>
                   <a href="." class="" data-action="windows">Windows</a>
                 </nav>
                 <div class="terminal-wrap">
@@ -86,6 +87,11 @@
 <pre class="prettyprint lang-bash">sudo add-apt-repository ppa:juju/stable
 sudo apt-get update && sudo apt-get install charm-tools</pre>
                   </div>
+                  <div data-section="osx">
+                    <p>Charm Tools is available via <a href="http://brew.sh/" target="_blank">Homebrew</a>. Make sure you're running the latest version of homebrew before proceeding.</p>
+                    <p>To install, run the following:</p>
+                    <pre class="prettyprint lang-bash">brew install juju</pre>
+                  </div>
                   <div data-section="windows">
                     <p>Charm Tools is available for, and tested, on Microsoft Windows 7 and 8. While the installer may work on previous versions of Windows there is no guarentee.</p>
                     <p>To install, first download the Charm Tools installer from <a href="https://github.com/juju/charm-tools/releases/download/1.0.0/charm-tools_1.0.0.exe">Github</a>. Once downloaded, execute the installer and follow the on-screen prompts. After installation you can access Charm Tools either via the <code>charm</code> command or <code>juju charm</code> plugin from either the command line or powershell.</p>