moparisthebest/android.moparisthebest.org
1
0
Fork 0
mirror of https://github.com/moparisthebest/android.moparisthebest.org synced 2025-02-28 16:31:44 -05:00
Code Issues Releases Wiki Activity

Swithced the order or RVM and rbenv in setup documentation to put rbenv first (favored). Added rake update task to updating docs

Browse Source
This commit is contained in:
Brandon Mathis 2012-05-22 23:34:53 -05:00
parent 98a372da9e
commit e41d0dde13
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/docs/setup/index.markdown
View File

@ -13,24 +13,25 @@ If that sounds daunting, Octopress probably isn't for you.
## Before You Begin ## Before You Begin
You'll need to [install Git](http://git-scm.com/) and set up your Ruby environment. 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. 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 ### 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 ```sh
rvm install 1.9.2 && rvm use 1.9.2 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 ## Setup Octopress

7
source/docs/updating/index.markdown
View File

@ -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. 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. 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 ### Updating the Template's Style
If you've pulled in changes and you want to update your `/sass` directory, run this. If you've pulled in changes and you want to update your `/sass` directory, run this.