diff options
| author | Grant McLean <grant@mclean.net.nz> | 2012-03-10 20:59:01 +1300 |
|---|---|---|
| committer | Grant McLean <grant@mclean.net.nz> | 2012-03-10 20:59:01 +1300 |
| commit | 5dee3919b559a9a9038da5c87bd24181911ec0c1 (patch) | |
| tree | d2834caff07fe72f159eb127ede6f55dee02d46f | |
| parent | 129ba87dc4d00cba7061111f6431531c4550aaca (diff) | |
| parent | 23c4efbb5b8804bc029423ef620c1e38914e1565 (diff) | |
| download | rails-5dee3919b559a9a9038da5c87bd24181911ec0c1.tar.gz rails-5dee3919b559a9a9038da5c87bd24181911ec0c1.tar.bz2 rails-5dee3919b559a9a9038da5c87bd24181911ec0c1.zip | |
Merge branch 'master' of github.com:lifo/docrails
| -rw-r--r-- | actionpack/lib/abstract_controller/layouts.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb index b02ee5ead3..a82e3dc90a 100644 --- a/actionpack/lib/abstract_controller/layouts.rb +++ b/actionpack/lib/abstract_controller/layouts.rb @@ -238,8 +238,7 @@ module AbstractController # # If the specified layout is a: # String:: the String is the template name - # Symbol:: call the method specified by the symbol, which will return - # the template name + # Symbol:: call the method specified by the symbol, which will return the template name # false:: There is no layout # true:: raise an ArgumentError # |