diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-04-04 12:42:22 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-04-04 12:42:22 +0530 |
| commit | 02b9c22df8053d71782ae11900d0194f217afc3c (patch) | |
| tree | 8a581720153199868492fb6ebec7be54573a1861 /railties/lib | |
| parent | e25eeed5b873f05f9614ecf6720c0eb636d52b63 (diff) | |
| parent | f89f74896b711d5b073289c9e485e3357c032cc8 (diff) | |
| download | rails-02b9c22df8053d71782ae11900d0194f217afc3c.tar.gz rails-02b9c22df8053d71782ae11900d0194f217afc3c.tar.bz2 rails-02b9c22df8053d71782ae11900d0194f217afc3c.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
guides/source/engines.textile
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/actions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb index 32793b1a70..8976927578 100644 --- a/railties/lib/rails/generators/actions.rb +++ b/railties/lib/rails/generators/actions.rb @@ -239,7 +239,7 @@ module Rails # # === Example # - # route "root :to => 'welcome'" + # route "root :to => 'welcome#index'" # def route(routing_code) log :route, routing_code |