diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-10-14 23:15:23 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-10-14 23:15:23 +0200 |
| commit | 13f7f89bda503ccb1abc8dc78fbe36c44d902c49 (patch) | |
| tree | 5359a0c9b0d21e4b1b2e44239db6457b6e21c4e5 /railties/guides/source | |
| parent | 01ab6f961bff150d50c99f03fa3946f48ac29b17 (diff) | |
| parent | cfb1ba023b11f82d776f9744ddbe7c826c8d7fbc (diff) | |
| download | rails-13f7f89bda503ccb1abc8dc78fbe36c44d902c49.tar.gz rails-13f7f89bda503ccb1abc8dc78fbe36c44d902c49.tar.bz2 rails-13f7f89bda503ccb1abc8dc78fbe36c44d902c49.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'railties/guides/source')
| -rw-r--r-- | railties/guides/source/association_basics.textile | 2 | ||||
| -rw-r--r-- | railties/guides/source/command_line.textile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/guides/source/association_basics.textile b/railties/guides/source/association_basics.textile index 6996dab8c5..f6d61373e1 100644 --- a/railties/guides/source/association_basics.textile +++ b/railties/guides/source/association_basics.textile @@ -550,7 +550,7 @@ build_customer create_customer </ruby> -h6(#belongs_to-association). <tt>_association_(force_reload = false)</tt> +h6(#belongs_to-association). <tt><em>association</em>(force_reload = false)</tt> The <tt><em>association</em></tt> method returns the associated object, if any. If no associated object is found, it returns +nil+. diff --git a/railties/guides/source/command_line.textile b/railties/guides/source/command_line.textile index cbdfda9215..752b5926f7 100644 --- a/railties/guides/source/command_line.textile +++ b/railties/guides/source/command_line.textile @@ -145,7 +145,7 @@ $ rails generate controller Greetings hello What all did this generate? It made sure a bunch of directories were in our application, and created a controller file, a functional test file, a helper for the view, and a view file. -Check out the controller and modify it a little (in +app/controllers/greetings_controller.rb+):ma +Check out the controller and modify it a little (in +app/controllers/greetings_controller.rb+): <ruby> class GreetingsController < ApplicationController |