diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-06-12 00:30:48 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-12 00:30:48 +0200 |
| commit | f2991fc9ccc379003081172c108d46977801915b (patch) | |
| tree | 771bc9cef05e551180c372de07c35624fa5292ea /railties | |
| parent | b731948bda27c50793c4d2ef249fee7ae625064c (diff) | |
| parent | 4278e7f2b34b12a9107baf9d5da0fa75384fbfa1 (diff) | |
| download | rails-f2991fc9ccc379003081172c108d46977801915b.tar.gz rails-f2991fc9ccc379003081172c108d46977801915b.tar.bz2 rails-f2991fc9ccc379003081172c108d46977801915b.zip | |
Merge remote branch 'docrails/master'
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/guides/source/3_0_release_notes.textile | 2 | ||||
| -rw-r--r-- | railties/guides/source/getting_started.textile | 2 | ||||
| -rw-r--r-- | railties/guides/source/routing.textile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/railties/guides/source/3_0_release_notes.textile b/railties/guides/source/3_0_release_notes.textile index cc6b84b814..b32ca4fce9 100644 --- a/railties/guides/source/3_0_release_notes.textile +++ b/railties/guides/source/3_0_release_notes.textile @@ -36,7 +36,7 @@ h4. Rails 3 requires at least Ruby 1.8.7 Rails 3.0 requires Ruby 1.8.7 or higher. Support for all of the previous Ruby versions has been dropped officially and you should upgrade as early as possible. Rails 3.0 is also compatible with Ruby 1.9.2. -TIP: Note that Ruby 1.8.7 p248 and p249 has marshaling bugs that crash Rails 3.0. Ruby Enterprise Edition have these fixed since release 1.8.7-2010.02 though. On the 1.9 front, Ruby 1.9.1 is not usable because it outright segfaults on Rails 3.0, so if you want to use Rails 3 with 1.9.x jump on 1.9.2 for smooth sailing. +TIP: Note that Ruby 1.8.7 p248 and p249 have marshaling bugs that crash Rails 3.0. Ruby Enterprise Edition have these fixed since release 1.8.7-2010.02 though. On the 1.9 front, Ruby 1.9.1 is not usable because it outright segfaults on Rails 3.0, so if you want to use Rails 3 with 1.9.x jump on 1.9.2 for smooth sailing. h4. Rails Application object diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile index 7d01759446..7b4f1ca471 100644 --- a/railties/guides/source/getting_started.textile +++ b/railties/guides/source/getting_started.textile @@ -17,7 +17,7 @@ This guide is designed for beginners who want to get started with a Rails applic * The "Ruby":http://www.ruby-lang.org/en/downloads language version 1.8.7 or higher -TIP: Note that Ruby 1.8.7 p248 and p249 has marshaling bugs that crash Rails 3.0. Ruby Enterprise Edition have these fixed since release 1.8.7-2010.02 though. On the 1.9 front, Ruby 1.9.1 is not usable because it outright segfaults on Rails 3.0, so if you want to use Rails 3 with 1.9.x jump on 1.9.2 for smooth sailing. +TIP: Note that Ruby 1.8.7 p248 and p249 have marshaling bugs that crash Rails 3.0. Ruby Enterprise Edition have these fixed since release 1.8.7-2010.02 though. On the 1.9 front, Ruby 1.9.1 is not usable because it outright segfaults on Rails 3.0, so if you want to use Rails 3 with 1.9.x jump on 1.9.2 for smooth sailing. * The "RubyGems":http://rubyforge.org/frs/?group_id=126 packaging system * A working installation of the "SQLite3 Database":http://www.sqlite.org diff --git a/railties/guides/source/routing.textile b/railties/guides/source/routing.textile index 79c5f4fabe..cf733bd6f8 100644 --- a/railties/guides/source/routing.textile +++ b/railties/guides/source/routing.textile @@ -597,7 +597,7 @@ resources :photos, :as => "images" will recognize incoming URLs beginning with +/photos+ and route the requests to +PhotosController+: |_.HTTP verb|_.URL |_.action |_.named helper | -|GET |/photos |index | images_path_ | +|GET |/photos |index | images_path | |GET |/photos/new |new | new_image_path | |POST |/photos |create | images_path | |GET |/photos/1 |show | image_path | |