From e41d0dde1339609165036db3fb935d0d9d2d9060 Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Tue, 22 May 2012 23:34:53 -0500
Subject: [PATCH] Swithced the order or RVM and rbenv in setup documentation to
 put rbenv first (favored). Added rake update task to updating docs

---
 source/docs/setup/index.markdown    | 19 ++++++++++---------
 source/docs/updating/index.markdown |  7 +++++++
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/source/docs/setup/index.markdown b/source/docs/setup/index.markdown
index 4893abe..31a0949 100644
--- a/source/docs/setup/index.markdown
+++ b/source/docs/setup/index.markdown
@@ -13,24 +13,25 @@ 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.
-**Octopress requires Ruby 1.9.2** which you can easily install with [RVM](http://rvm.beginrescueend.com) or [rbenv](https://github.com/sstephenson/rbenv).
+**Octopress requires Ruby 1.9.2** which you can easily install with [rbenv](https://github.com/sstephenson/rbenv) or [RVM](http://rvm.beginrescueend.com).
 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.2.
+
+```sh
+rbenv install 1.9.2-p290
+```
+
 ### Using RVM
 
-If you don't have RVM yet, [Install RVM](/docs/setup/rvm) and then install Ruby 1.9.2.
+If you don't have RVM, [Install RVM](/docs/setup/rvm) and then install Ruby 1.9.2.
 
 ```sh
 rvm install 1.9.2 && rvm use 1.9.2
 ```
 
-### Using rbenv
-
-If you don't have rbenv yet, [Install rbenv](https://github.com/sstephenson/rbenv#section_2) and [install ruby-build](https://github.com/sstephenson/ruby-build), then install Ruby 1.9.2.
-
-```sh
-rbenv install 1.9.2-p290
-```
 
 ## Setup Octopress
 
diff --git a/source/docs/updating/index.markdown b/source/docs/updating/index.markdown
index a45a584..8cc1747 100644
--- a/source/docs/updating/index.markdown
+++ b/source/docs/updating/index.markdown
@@ -34,6 +34,13 @@ updates and screwing up your changes.
 When you pull down changes from the Octopress repository, the latest layouts, pages, javascripts and styles are merged into your `.themes` directory.
 To update your site, you must manually merge in the new files. Before you do a spit-take, I written some Rake tasks to help out with this.
 
+### Updating the template
+In one shot, update your `/source` and `/sass` directories.
+
+    rake update
+
+This will run `update_style` and `update_source` which you can use independently if you only wish to update one part of your project.
+
 ### Updating the Template's Style
 If you've pulled in changes and you want to update your `/sass` directory, run this.