diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-11-17 01:50:49 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-11-17 01:50:49 +0530 |
| commit | 7b70eeed43045dc29e73e23fbfdc323e9d397026 (patch) | |
| tree | 8c60cd5893f7e2d231130b7c0abdc0aee8e3bec7 /actionpack/lib/abstract_controller | |
| parent | 8eefdb6d7056dc0d4d63a5c34a4b12701ba21c88 (diff) | |
| parent | 1fd008cd44cd2eea37db57ee6b3c17d3585d88c1 (diff) | |
| download | rails-7b70eeed43045dc29e73e23fbfdc323e9d397026.tar.gz rails-7b70eeed43045dc29e73e23fbfdc323e9d397026.tar.bz2 rails-7b70eeed43045dc29e73e23fbfdc323e9d397026.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
actionpack/lib/action_dispatch/routing/redirection.rb
Diffstat (limited to 'actionpack/lib/abstract_controller')
| -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 c1b3994035..12da273af9 100644 --- a/actionpack/lib/abstract_controller/layouts.rb +++ b/actionpack/lib/abstract_controller/layouts.rb @@ -170,7 +170,7 @@ module AbstractController # <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 + # layout "weblog_standard", except: :rss # # # ... # @@ -180,7 +180,7 @@ module AbstractController # 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>. + # #<tt>except: [ :rss, :text_only ]</tt> is valid, as is <tt>except: :rss</tt>. # # == Using a different layout in the action render call # @@ -192,7 +192,7 @@ module AbstractController # layout "weblog_standard" # # def help - # render :action => "help", :layout => "help" + # render action: "help", layout: "help" # end # end # |