aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/layout.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-07-06 09:32:00 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-07-06 09:32:00 +0000
commit853ea556749809658c0a5c0c8b61263ec022fba1 (patch)
treedfc15b8c05381e58aee1c69b80d14ff619a6510d /actionpack/lib/action_controller/layout.rb
parent744058b6997edbd323e888e19e58d6573eb60ddf (diff)
downloadrails-853ea556749809658c0a5c0c8b61263ec022fba1.tar.gz
rails-853ea556749809658c0a5c0c8b61263ec022fba1.tar.bz2
rails-853ea556749809658c0a5c0c8b61263ec022fba1.zip
Made documentation ready for release (AP)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1731 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/layout.rb')
-rw-r--r--actionpack/lib/action_controller/layout.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb
index 07c02f0de3..d7e01564a0 100644
--- a/actionpack/lib/action_controller/layout.rb
+++ b/actionpack/lib/action_controller/layout.rb
@@ -125,7 +125,7 @@ module ActionController #:nodoc:
#
# If you have a layout that by default is applied to all the actions of a controller, you still have the option of rendering
# a given action or set of actions without a layout, or restricting a layout to only a single action or a set of actions. The
- # +:only+ and +:except+ options can be passed to the layout call. For example:
+ # <tt>:only</tt> and <tt>:except</tt> options can be passed to the layout call. For example:
#
# class WeblogController < ActionController::Base
# layout "weblog_standard", :except => :rss
@@ -137,8 +137,8 @@ module ActionController #:nodoc:
# 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.
#
- # Both the +:only+ and +:except+ condition can accept an arbitrary number of method references, so +:except => [ :rss, :text_only ]+
- # is valid, as is # +:except => :rss+.
+ # 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>.
#
# == Using a different layout in the action render call
#