diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-07-07 12:58:46 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-07-07 12:58:46 +0200 |
| commit | 64c75d6618b6bc21576e95ceb31467d1984ecb33 (patch) | |
| tree | 5060a400487473e0abe9baecb9fe7bfa16355083 /railties/lib/rails | |
| parent | 8735d15e61797d0e6879efbde4f1ca18b4403eff (diff) | |
| parent | 0f96cea322294f84df34c43000443b249a880126 (diff) | |
| download | rails-64c75d6618b6bc21576e95ceb31467d1984ecb33.tar.gz rails-64c75d6618b6bc21576e95ceb31467d1984ecb33.tar.bz2 rails-64c75d6618b6bc21576e95ceb31467d1984ecb33.zip | |
Merge remote branch 'docrails/master'
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/actions.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/README | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb index 199afbdc30..a27d38e23a 100644 --- a/railties/lib/rails/generators/actions.rb +++ b/railties/lib/rails/generators/actions.rb @@ -267,7 +267,7 @@ module Rails ActiveSupport::Deprecation.warn "freeze! is deprecated since your rails app now comes bundled with Rails by default, please check your Gemfile" end - # Make an entry in Rails routing file conifg/routes.rb + # Make an entry in Rails routing file config/routes.rb # # === Example # diff --git a/railties/lib/rails/generators/rails/app/templates/README b/railties/lib/rails/generators/rails/app/templates/README index e2764dee03..6966fe987e 100644 --- a/railties/lib/rails/generators/rails/app/templates/README +++ b/railties/lib/rails/generators/rails/app/templates/README @@ -35,7 +35,7 @@ link:files/vendor/rails/actionpack/README.html. <tt>cd myapp; rails server</tt> (run with --help for options) 3. Go to http://localhost:3000/ and you'll see: - "Welcome aboard: You're riding the Rails!" + "Welcome aboard: You're riding Ruby on Rails!" 4. Follow the guidelines to start developing your application. You can find the following resources handy: |