From dd3a572fcc90ee4cbef01bea3f1454dbd1db2a49 Mon Sep 17 00:00:00 2001
From: Felipe Cypriano <fmcypriano@gmail.com>
Date: Thu, 22 Sep 2011 15:58:44 -0300
Subject: [PATCH] Update the setup/index.markdown to show how to install
 Octopress using rbenv

---
 .rbenv-version                   |  1 +
 source/docs/setup/index.markdown | 26 +++++++++++++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 .rbenv-version

diff --git a/.rbenv-version b/.rbenv-version
new file mode 100644
index 0000000..0a95b9f
--- /dev/null
+++ b/.rbenv-version
@@ -0,0 +1 @@
+1.9.2-p290
diff --git a/source/docs/setup/index.markdown b/source/docs/setup/index.markdown
index 94da8c0..5453c37 100644
--- a/source/docs/setup/index.markdown
+++ b/source/docs/setup/index.markdown
@@ -15,23 +15,39 @@ If that sounds daunting, Octopress probably isn't for you.
 You'll need to have Git and RVM installed before you move forward.
 
 1. [Download Git](http://git-scm.com/)
-2. [Setup RVM](/docs/setup/rvm)
 
-Octopress requires Ruby 1.9.2 so once you have RVM set up, go ahead and install it.
+Octopress requires Ruby 1.9.2 so you have two alternatives to install it: RVM or rbenv.
+
+**Important:** you can't have both rbenv and RVM installed on the same system. Choose one.
+
+### RVM steps
+
+1. [Setup RVM](/docs/setup/rvm)
+2. Install Ruby 1.9.2
 
 ```sh
 rvm install 1.9.2
 ```
 
+### rbenv steps
+
+1. [Install rbenv](https://github.com/sstephenson/rbenv#section_2)
+2. [Install ruby-build](https://github.com/sstephenson/ruby-build)
+3. Install Ruby 1.9.2
+
+```sh
+rbenv install 1.9.2-p290
+```
+
 ## Setup Octopress
 
 ```sh
 git clone git://github.com/imathis/octopress.git octopress
-cd octopress  # You'll be asked if you trust the .rvmrc file (say yes).
-which ruby    # Should report Ruby 1.9.2
+cd octopress    # If you use RVM, You'll be asked if you trust the .rvmrc file (say yes).
+ruby --version  # Should report Ruby 1.9.2
 ```
 
-If `which ruby` doesn't say you're using Ruby 1.9.2, you may want to [revisit your RVM installation](/docs/setup/rvm).
+If `ruby --version` doesn't say you're using Ruby 1.9.2, you may want to [revisit your RVM installation](/docs/setup/rvm).
 
 Next, install dependencies.