Browse files

Merge branch 'ysiadf-integrating'

  • Loading branch information...
2 parents eaae041 + 33aa71c commit aa36719bd95971d49e27e2091ad08af067355cce Rodrigo Flores committed Feb 13, 2012
Showing with 8 additions and 9 deletions.
  1. +4 −4 README.md
  2. +4 −5 lib/generators/templates/README
View
8 README.md
@@ -89,11 +89,11 @@ Once you have solidified your understanding of Rails and authentication mechanis
## Getting started
-Devise 2.0 works with Rails 3.1 onwards. You can install it with:
+Devise 2.0 works with Rails 3.1 onwards. You can add it to your Gemfile with:
-```console
-gem install devise
-```
+ gem 'devise'
+
+Run the bundle command to install it.
After you install Devise and add it to your Gemfile, you need to run the generator:
View
9 lib/generators/templates/README
@@ -1,15 +1,14 @@
-
===============================================================================
Some setup you must do manually if you haven't yet:
- 1. Setup default url options for your specific environment. Here is an
- example of development environment:
+ 1. Ensure you have defined default url options in your environments files. Here
+ is an example of default_url_options appropriate for a development environment
+ in config/environments/development.rb:
config.action_mailer.default_url_options = { :host => 'localhost:3000' }
- This is a required Rails configuration. In production it must be the
- actual host of your application
+ In production, :host should be set to the actual host of your application.
2. Ensure you have defined root_url to *something* in your config/routes.rb.
For example:

0 comments on commit aa36719

Please sign in to comment.