diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-30 12:40:32 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-30 12:40:32 -0800 |
| commit | d9615928866115015e9ec48ac88a90869ef85d9b (patch) | |
| tree | e6783aeeb36f1b8263d97d2548a39a4e5ee58fa6 /actionpack/lib/action_view/base.rb | |
| parent | 276ec16007b03d0a527fb0b83a7ee0b81e460fa1 (diff) | |
| parent | 82443ecfad5e756da922d6a166b0093c8a74d720 (diff) | |
| download | rails-d9615928866115015e9ec48ac88a90869ef85d9b.tar.gz rails-d9615928866115015e9ec48ac88a90869ef85d9b.tar.bz2 rails-d9615928866115015e9ec48ac88a90869ef85d9b.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_view/base.rb')
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 8958e61e9d..70a0ba91a7 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -225,7 +225,7 @@ module ActionView #:nodoc: end # Returns the result of a render that's dictated by the options hash. The primary options are: - # + # # * <tt>:partial</tt> - See ActionView::Partials. # * <tt>:update</tt> - Calls update_page with the block given. # * <tt>:file</tt> - Renders an explicit template file (this used to be the old default), add :locals to pass in those. |