diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2010-11-27 11:31:17 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2010-11-27 11:31:17 +0000 |
| commit | 3a7f43ca6ecf1735e1a82d4a68ac8f62b5cf2fcf (patch) | |
| tree | 4960911c58f2c47ecaf4f4579167270ba9c257a7 /railties/guides/source/3_0_release_notes.textile | |
| parent | 1bc90044b655572a4b8aa3b323905e26d37e0f2b (diff) | |
| parent | fd83f9d51583c080072dc9fd00f02ad742e265d4 (diff) | |
| download | rails-3a7f43ca6ecf1735e1a82d4a68ac8f62b5cf2fcf.tar.gz rails-3a7f43ca6ecf1735e1a82d4a68ac8f62b5cf2fcf.tar.bz2 rails-3a7f43ca6ecf1735e1a82d4a68ac8f62b5cf2fcf.zip | |
Merge branch 'master' into nested_has_many_through
Conflicts:
activerecord/CHANGELOG
activerecord/lib/active_record/associations.rb
Diffstat (limited to 'railties/guides/source/3_0_release_notes.textile')
| -rw-r--r-- | railties/guides/source/3_0_release_notes.textile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/guides/source/3_0_release_notes.textile b/railties/guides/source/3_0_release_notes.textile index 9c08c9fa0a..adb1c755df 100644 --- a/railties/guides/source/3_0_release_notes.textile +++ b/railties/guides/source/3_0_release_notes.textile @@ -271,10 +271,10 @@ end <ruby> scope 'es' do - resources :projects, :path_names => { :edit => 'cambiar' }, :path => 'projeto' + resources :projects, :path_names => { :edit => 'cambiar' }, :path => 'proyecto' end -# Gives you the edit action with /es/projeto/1/cambiar +# Gives you the edit action with /es/proyecto/1/cambiar </ruby> * Added +root+ method to the router as a short cut for <tt>match '/', :to => path</tt>. |