Updated documentation for setup and installing rbenv and rvm

source/docs/setup/index.markdown

@@ -12,26 +12,10 @@ If that sounds daunting, Octopress probably isn't for you.
 
 ## Before You Begin
 
-You'll need to [install Git](http://git-scm.com/) and set up your Ruby environment.
+1. [Install Git](http://git-scm.com/).
-**Octopress requires Ruby 1.9.3** which you can easily install with [rbenv](https://github.com/sstephenson/rbenv) or [RVM](http://rvm.beginrescueend.com).
+2. Install Ruby 1.9.3 using either [rbenv](/docs/setup/rbenv) or [RVM](/docs/setup/rvm).
-You can't use both rbenv and RVM on the same system, as they are competing Ruby environment managers, so choose one.
-
-### Using rbenv
-
-If you don't have rbenv, [Install rbenv](https://github.com/sstephenson/rbenv#section_2) and [install ruby-build](https://github.com/sstephenson/ruby-build), then install Ruby 1.9.3.
-
-```sh
-rbenv install 1.9.3-p0
-```
-
-### Using RVM
-
-If you don't have RVM, [Install RVM](/docs/setup/rvm) and then install Ruby 1.9.3.
-
-```sh
-rvm install 1.9.3 && rvm use 1.9.3
-```
 
+If `ruby --version` doesn't say you're using Ruby 1.9.3, revisit your [rbenv](/docs/setup/rbenv) or [RVM](/docs/setup/rvm) installation.
 
 ## Setup Octopress
 
@@ -41,8 +25,6 @@ cd octopress    # If you use RVM, You'll be asked if you trust the .rvmrc file (
 ruby --version  # Should report Ruby 1.9.3
 ```
 
-If `ruby --version` doesn't say you're using Ruby 1.9.3, you may want to [revisit your RVM installation](/docs/setup/rvm).
-
 Next, install dependencies.
 
 ```sh

source/docs/setup/rbenv/index.markdown

@@ -0,0 +1,47 @@
+---
+layout: page
+title: "Installing Ruby with Rbenv"
+date: July 31 2012
+sidebar: false
+footer: false
+---
+
+Rbenv handles the installation and management of multiple Ruby environments. Ruby 1.9.3 is required for Octopress and using rbenv you can install it with ease.
+
+## Standard Rbenv Installation
+
+The standard method for installing rbenv uses Git. From your terminal, run the following commands:
+
+```sh
+cd
+git clone git://github.com/sstephenson/rbenv.git .rbenv
+echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bash_profile
+echo 'eval "$(rbenv init -)"' >> ~/.bash_profile
+git clone git://github.com/sstephenson/ruby-build.git ~/.rbenv/plgs/ruby-build
+source ~/.bash_profile
+```
+
+**Zsh users:** In the instructions above substitute `~/.bash_profile` with `~/.zshenv`.
+
+## Alternate Installation Using Homebrew
+
+If you use Homebrew on Mac OS X you may prefer to install rbenv like this:
+
+```sh
+brew update
+brew install rbenv
+brew install ruby-build
+```
+
+## Install Ruby 1.9.3
+
+Next install Ruby 1.9.3 and you'll be all set.
+
+```sh
+rbenv install 1.9.3-p0
+rbenv rehash
+```
+
+Run `ruby --version` to be sure you're using Ruby 1.9.3. If you're having trouble, [seek help here](https://github.com/sstephenson/rbenv/issues)
+
+[← Return to setup](/docs/setup)

source/docs/setup/rvm/index.markdown

@@ -1,31 +1,34 @@
 ---
 layout: page
-title: "Installing RVM"
+title: "Installing Ruby with RVM"
-date: September 19 2011
+date: July 31 2012
 sidebar: false
 footer: false
 ---
 
-RVM (Ruby Version Manager) handles the installation and management of multiple Ruby environments, and Octopress was designed to work in an RVM-controlled environment.
-Installation should be pretty smooth, but if you have trouble [get help here](https://rvm.beginrescueend.com/support/).
 
-Run this command to install RVM for your user account.
+RVM (Ruby Version Manager) handles the installation and management of multiple Ruby environments. Ruby 1.9.3 is required for Octopress and using RVM you can install it with ease.
+
+## Install RVM
+
+Run the following command from your terminal.
 
 ```sh
 curl -L https://get.rvm.io | bash -s stable --ruby
 ```
 
-Next add RVM to your shell as a function. (Or simply close and reopen your shell.)
+Be sure to follow any subsequent instructions as guided by the installation process.
+
+## Install Ruby 1.9.3
+
+Next install Ruby 1.9.3 and you'll be all set.
 
 ```sh
-source ~/.bash_profile
+rvm install 1.9.3
-
+rvm use 1.9.3
-# If using Zsh do this instead
+rvm rubygems latest
-source ~/.zshrc
 ```
 
-Install Ruby 1.9.3 and ensure RVM has the latest RubyGems.
+Run `ruby --version` to be sure you're using Ruby 1.9.3. If you're having trouble, [seek help here](https://rvm.io/support).
 
-```sh
+[← Return to setup](/docs/setup)
-rvm install 1.9.3 && rvm use 1.9.3
-```