From dd7fce8dce02ad4e9c703d236f02eb7ce3ae5231 Mon Sep 17 00:00:00 2001
From: Allen Hancock <hancock@yesthatallen.com>
Date: Mon, 13 Jan 2014 01:53:08 -0600
Subject: [PATCH] Clean up Mac OS how-to, add troubleshooting step

---
 docs/DEVELOPMENT-OSX-NATIVE.md | 44 +++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/docs/DEVELOPMENT-OSX-NATIVE.md b/docs/DEVELOPMENT-OSX-NATIVE.md
index ec3c0e9f8..4e0892526 100644
--- a/docs/DEVELOPMENT-OSX-NATIVE.md
+++ b/docs/DEVELOPMENT-OSX-NATIVE.md
@@ -125,12 +125,6 @@ In theory, you're not setting up with vagrant, either, and shouldn't need a vagr
 
 You should not need to alter `/usr/local/var/postgres/pg_hba.conf`
 
-### Loading seed data
-
-From the discource source tree:
-    
-    psql -d discourse_development < pg_dumps/development-image.sql
-
 ## Redis
 
     brew install redis
@@ -145,14 +139,48 @@ Homebrew loves you.
 
     brew install phantomjs
 
+### Setting up your Discourse
+
+
+##  Check out the repository
+
+    git@github.com:discourse/discourse.git ~/discourse
+    cd ~/discourse # Navigate into the repository, and stay there for the rest of this how-to
+
+## Loading seed data
+
+From the discource source tree:
+    
+    psql -d discourse_development < pg_dumps/development-image.sql
+
+
+## What about the config files?
 
 If you've stuck to all the defaults above, the default `discourse.conf` and `redis.conf` should work out of the box. 
 
-## Now, test it out!
+## Install the needed gems
 
     bundle install # Yes, this DOES take a while. No, it's not really cloning all of rubygems :-)
+
+## Prepare your database
+
     rake db:migrate
     rake db:test:prepare
     rake db:seed_fu
-    bundle exec rspec # All specs should pass
 
+## Now, test it out!
+
+    bundle exec rspec 
+    
+All specs should pass
+
+## Deal with any problems which arise.
+
+Reset the environment as a possible solution to failed rspec tests.
+These commands assume an empty Discourse database, and an otherwise empty redis environment. CAREFUL HERE
+
+    RAILS_ENV=test rake db:drop db:create db:migrate
+    redis-cli flushall
+    bundle exec rspec # re-running to see if tests pass
+
+Search http://meta.discourse.org for solutions to other problems.