diff options
| author | Oscar Del Ben <info@oscardelben.com> | 2012-04-27 14:21:16 +0200 |
|---|---|---|
| committer | Oscar Del Ben <info@oscardelben.com> | 2012-04-27 14:21:16 +0200 |
| commit | fc3d15dcb0c4265d1aaeedfc51d8a8c8e382347a (patch) | |
| tree | 05fc3bc5c7df89712f1f11e7f94306100265e74f /railties | |
| parent | f4447607f20c420d9c341b19064c07d5b7aa6cee (diff) | |
| parent | 39574aa582337baa32a58caae7b2671cb52ae718 (diff) | |
| download | rails-fc3d15dcb0c4265d1aaeedfc51d8a8c8e382347a.tar.gz rails-fc3d15dcb0c4265d1aaeedfc51d8a8c8e382347a.tar.bz2 rails-fc3d15dcb0c4265d1aaeedfc51d8a8c8e382347a.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/configuration.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/test_case.rb | 8 | ||||
| -rw-r--r-- | railties/lib/rails/paths.rb | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb index d8ca6cbd21..493eacdc5a 100644 --- a/railties/lib/rails/configuration.rb +++ b/railties/lib/rails/configuration.rb @@ -16,7 +16,7 @@ module Rails # # config.middleware.use Magical::Unicorns # - # This will put the +Magical::Unicorns+ middleware on the end of the stack. + # This will put the <tt>Magical::Unicorns</tt> middleware on the end of the stack. # You can use +insert_before+ if you wish to add a middleware before another: # # config.middleware.insert_before ActionDispatch::Head, Magical::Unicorns diff --git a/railties/lib/rails/generators/test_case.rb b/railties/lib/rails/generators/test_case.rb index 2cb34fab7a..508e221c60 100644 --- a/railties/lib/rails/generators/test_case.rb +++ b/railties/lib/rails/generators/test_case.rb @@ -79,8 +79,8 @@ module Rails # # Finally, when a block is given, it yields the file content: # - # assert_file "app/controller/products_controller.rb" do |controller| - # assert_instance_method :index, content do |index| + # assert_file "app/controllers/products_controller.rb" do |controller| + # assert_instance_method :index, controller do |index| # assert_match(/Product\.all/, index) # end # end @@ -159,8 +159,8 @@ module Rails # Asserts the given method exists in the given content. When a block is given, # it yields the content of the method. # - # assert_file "app/controller/products_controller.rb" do |controller| - # assert_instance_method :index, content do |index| + # assert_file "app/controllers/products_controller.rb" do |controller| + # assert_instance_method :index, controller do |index| # assert_match(/Product\.all/, index) # end # end diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb index dd1790299d..9b4a69f19f 100644 --- a/railties/lib/rails/paths.rb +++ b/railties/lib/rails/paths.rb @@ -8,7 +8,7 @@ module Rails # root.add "app/controllers", :eager_load => true # # The command above creates a new root object and add "app/controllers" as a path. - # This means we can get a +Rails::Paths::Path+ object back like below: + # This means we can get a <tt>Rails::Paths::Path</tt> object back like below: # # path = root["app/controllers"] # path.eager_load? # => true |