added os x build for source instructions

Author: Jesse Seldess

.DS_Store

@@ -2,53 +2,63 @@
 title: Run on OS X
 ---
 
-There are four ways to install and run CockroachDB on OS X for local development and testing:
+There are currently two ways to deploy CockroachDB locally on OSX:
 
 -	[Download the Binary](#download-the-binary)
--	[Use Docker](#use-docker)
-- 	[Use Homebrew](#use-homebrew)
 -	[Build from Source](#build-from-source)
 
 ## Download the Binary
 
-## Use Docker
-
-Docker provides an official CockroachDB image. 
 
-1. 	**Install Docker**  
-	For a quick Docker install, run the following commands in your system shell. See [Docker's official documentation](https://docs.docker.com/engine/installation/mac/) for full installation instructions. 
+## Build from Source
 
-	```bash
+1.  Install the following prerequisites, as necessary:
+    - A C++ compiler that supports C++11 (GCC 4.9+ and clang 3.6+ are known to work). On Mac OS X, Xcode should suffice. 
+    - A [Go environment](http://golang.org/doc/code.html) with a 64-bit version of Go 1.5. You can download the [Go binary](https://golang.org/dl/) directly from the official site. On OS X, you can also use [homebrew](http://brew.sh): `brew install go`. 
+    - Git 1.8+ 
 
-	# Install docker and docker-machine: 
-	$ brew install docker docker-machine
+2.  Get the CockroachDB code:
 
-	# Install VirtualBox: 
-	$ brew cask install virtualbox
+    ```bash
+    $ go get -d github.com/cockroachdb/cockroach
+    ```
 
-	# Create and start the virtual machine: 
-	$ docker-machine create --driver virtualbox default
+3. Compile the CockroachDB binary:
 
-	# Set up the environment for the docker client: 
-	$ eval $(docker-machine env default)
+	```bash
+    $ cd $GOPATH/src/github.com/cockroachdb/cockroach
+	$ make build
 	```
 
-2. 	**Pull the CockroachDB image**  
+	The first time you run `make`, it can take some time to download and install various dependencies.
+
+4. Start up a cluster:
 
 	```bash
-	$ docker pull cockroachdb/cockroach
+	$ ./cockroach start --dev &
 	```
 
-3.	**Start up the Cockroach shell**
+## Use Docker
+
+Deploying CockroachDB in Docker is quick and easy. Once you've installed Docker, just run Cockroach in the default Docker container.  
+
+1. 	[Install Docker](https://docs.docker.com/mac/step_one/), as described in Docker's installation instructions for OS X.   
+
+2.	To start CockroachDB, run this command in your terminal:
 
 	```bash
 	$ docker run -t -i cockroachdb/cockroach shell
-	# root@82cb657cdc42:/cockroach#
 	```
 
+	The first time you do this, Docker pulls the official CockroachDB image from Docker Hub. From that point on, the image remains on your local system. You can run `docker images` to list all of your local images.
 
-## Build from Source
+	```bash
+	$ docker images
 
+	REPOSITORY              TAG			IMAGE ID            CREATED             VIRTUAL SIZE
+	cockroachdb/cockroach   latest 		e707dfaf8703        2 days ago			278.2 MB
+	hello-world             latest      0a6ba66e537a        9 weeks ago         960 B
+	```
 
 Random code sample:
 

_get_started/2_run_on_osx.md

@@ -3,7 +3,7 @@
   <title>CockroachDB Docs</title>
   <link href="http://docs.cockroachlabs.com/atom.xml" rel="self" />
   <link href="http://docs.cockroachlabs.com/"/>
-  <updated>2015-12-16T22:04:38-05:00</updated>
+  <updated>2015-12-17T18:00:31-05:00</updated>
   <id>http://docs.cockroachlabs.com</id>
   <author>
     <name>Jesse</name>

_site/atom/index.xml

@@ -3,7 +3,7 @@
   <title>CockroachDB Docs</title>
   <link href="http://docs.cockroachlabs.com/atom.xml" rel="self" />
   <link href="http://docs.cockroachlabs.com/"/>
-  <updated>2015-12-16T22:04:38-05:00</updated>
+  <updated>2015-12-17T18:00:31-05:00</updated>
   <id>http://docs.cockroachlabs.com</id>
   <author>
     <name>Jesse</name>

_site/docs/atom/index.xml

@@ -356,47 +356,56 @@ <h3>Get Started</h3>
 	</div>
 	<article class="content">
 
-		<p>There are four ways to install and run CockroachDB on OS X for local development and testing:</p>
+		<p>There are currently two ways to deploy CockroachDB locally on OSX:</p>
 
 <ul>
 <li>  <a href="#download-the-binary">Download the Binary</a></li>
-<li>  <a href="#use-docker">Use Docker</a></li>
-<li>  <a href="#use-homebrew">Use Homebrew</a></li>
 <li>  <a href="#build-from-source">Build from Source</a></li>
 </ul>
 
 <h2 id="download-the-binary">Download the Binary</h2>
 
-<h2 id="use-docker">Use Docker</h2>
-
-<p>Docker provides an official CockroachDB image. </p>
+<h2 id="build-from-source">Build from Source</h2>
 
 <ol>
-<li><p><strong>Install Docker</strong><br>
-For a quick Docker install, run the following commands in your system shell. See <a href="https://docs.docker.com/engine/installation/mac/">Docker&#39;s official documentation</a> for full installation instructions. </p>
-<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="c"># Install docker and docker-machine: </span>
-<span class="nv">$ </span>brew install docker docker-machine
-
-<span class="c"># Install VirtualBox: </span>
-<span class="nv">$ </span>brew cask install virtualbox
+<li><p>Install the following prerequisites, as necessary:</p>
 
-<span class="c"># Create and start the virtual machine: </span>
-<span class="nv">$ </span>docker-machine create --driver virtualbox default
-
-<span class="c"># Set up the environment for the docker client: </span>
-<span class="nv">$ </span><span class="nb">eval</span> <span class="k">$(</span>docker-machine env default<span class="k">)</span>
+<ul>
+<li>  A working C++ compiler that supports C++11</li>
+<li>  A 64-bit version of Go (download from https://golang.org/dl/ or run brew install go --cross-compile-common)</li>
+<li>  Git 1.8+ and Mercurial</li>
+</ul></li>
+<li><p>Get the CockroachDB code from your Go workspace (directory specified in your <code>GOPATH</code> environment variable):</p>
+<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span>go get -d github.com/cockroachdb/cockroach
 </code></pre></div></li>
-<li><p><strong>Pull the CockroachDB image</strong>  </p>
-<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span>docker pull cockroachdb/cockroach
+<li><p>Compile the CockroachDB binary:</p>
+<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span><span class="nb">cd </span>cockroach
+<span class="nv">$ </span>make build
+</code></pre></div>
+<p>The first time you run <code>make</code>, it can take some time to download and install various dependent libraries and tools.</p></li>
+<li><p>Start up a cluster:</p>
+<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span>./cockroach start --dev <span class="p">&amp;</span>
 </code></pre></div></li>
-<li><p><strong>Start up the Cockroach shell</strong></p>
+</ol>
+
+<h2 id="use-docker">Use Docker</h2>
+
+<p>Deploying CockroachDB in Docker is quick and easy. Once you&#39;ve installed Docker, just run Cockroach in the default Docker container.  </p>
+
+<ol>
+<li><p><a href="https://docs.docker.com/mac/step_one/">Install Docker</a>, as described in Docker&#39;s installation instructions for OS X.   </p></li>
+<li><p>To start CockroachDB, run this command in your terminal:</p>
 <div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span>docker run -t -i cockroachdb/cockroach shell
-<span class="c"># root@82cb657cdc42:/cockroach#</span>
+</code></pre></div>
+<p>The first time you do this, Docker pulls the official CockroachDB image from Docker Hub. From that point on, the image remains on your local system. You can run <code>docker images</code> to list all of your local images.</p>
+<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span>docker images
+
+REPOSITORY              TAG         IMAGE ID            CREATED             VIRTUAL SIZE
+cockroachdb/cockroach   latest      e707dfaf8703        <span class="m">2</span> days ago          278.2 MB
+hello-world             latest      0a6ba66e537a        <span class="m">9</span> weeks ago         <span class="m">960</span> B
 </code></pre></div></li>
 </ol>
 
-<h2 id="build-from-source">Build from Source</h2>
-
 <p>Random code sample:</p>
 
 <div class="highlight"><pre><code class="language-python" data-lang="python"><span class="k">print</span><span class="p">(</span><span class="s">&#39;Welcome to the Pig Latin Translator!&#39;</span><span class="p">)</span>