diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-17 17:49:33 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-17 17:49:33 +0530 |
| commit | 03f8a574872f1206c16720af034e4bb91930d237 (patch) | |
| tree | bb4a38ffdf977296bfb90989308994e1c4c01fa6 /actionpack/lib/action_view/context.rb | |
| parent | 17f583b7bc004adbb1ac44f156c806df018c7365 (diff) | |
| parent | 612f7fe7014294d646f4b46ed3b927f68ee76fc7 (diff) | |
| download | rails-03f8a574872f1206c16720af034e4bb91930d237.tar.gz rails-03f8a574872f1206c16720af034e4bb91930d237.tar.bz2 rails-03f8a574872f1206c16720af034e4bb91930d237.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
activerecord/lib/active_record/core.rb
Diffstat (limited to 'actionpack/lib/action_view/context.rb')
| -rw-r--r-- | actionpack/lib/action_view/context.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/context.rb b/actionpack/lib/action_view/context.rb index 083856b2ca..245849d706 100644 --- a/actionpack/lib/action_view/context.rb +++ b/actionpack/lib/action_view/context.rb @@ -5,7 +5,7 @@ module ActionView # = Action View Context # - # Action View contexts are supplied to Action Controller to render template. + # Action View contexts are supplied to Action Controller to render a template. # The default Action View context is ActionView::Base. # # In order to work with ActionController, a Context must just include this module. @@ -25,7 +25,7 @@ module ActionView end # Encapsulates the interaction with the view flow so it - # returns the correct buffer on yield. This is usually + # returns the correct buffer on +yield+. This is usually # overwriten by helpers to add more behavior. # :api: plugin def _layout_for(name=nil) |