diff options
| author | Matt Jankowski <mjankowski@thoughtbot.com> | 2011-06-21 10:34:31 -0400 |
|---|---|---|
| committer | Matt Jankowski <mjankowski@thoughtbot.com> | 2011-06-21 10:34:31 -0400 |
| commit | 538d2a52ce5025861f554c8e5ef850d0098a914d (patch) | |
| tree | 9c73fc315491fca543f329fa78aeeeb8ac4a8ad9 /actionpack | |
| parent | 20a9bddfada88a8a46effc2e9c93190c58ba9318 (diff) | |
| download | rails-538d2a52ce5025861f554c8e5ef850d0098a914d.tar.gz rails-538d2a52ce5025861f554c8e5ef850d0098a914d.tar.bz2 rails-538d2a52ce5025861f554c8e5ef850d0098a914d.zip | |
remove extra space and clarify how an exception is made for controller wide layouts
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/abstract_controller/layouts.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb index 5765ad34f7..5853fb7852 100644 --- a/actionpack/lib/abstract_controller/layouts.rb +++ b/actionpack/lib/abstract_controller/layouts.rb @@ -139,8 +139,8 @@ module AbstractController # # end # - # This will assign "weblog_standard" as the WeblogController's layout except for the +rss+ action, which will not wrap a layout - # around the rendered view. + # This will assign "weblog_standard" as the WeblogController's layout for all actions except for the +rss+ action, which will + # be rendered directly, without wrapping a layout around the rendered view. # # Both the <tt>:only</tt> and <tt>:except</tt> condition can accept an arbitrary number of method references, so # #<tt>:except => [ :rss, :text_only ]</tt> is valid, as is <tt>:except => :rss</tt>. @@ -159,7 +159,7 @@ module AbstractController # end # end # - # This will render the help action with the "help" layout instead of the controller-wide "weblog_standard" layout. + # This will override the controller-wide "weblog_standard" layout, and will render the help action with the "help" layout instead. module Layouts extend ActiveSupport::Concern |