diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-12-06 23:05:43 +0530 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-12-06 23:05:43 +0530 |
commit | 7eb596cddd75b379ca2ca25955b0bd2af77a89bc (patch) | |
tree | fe4dac360edc71ec5e8f0487a113b59f139505fd /actionpack | |
parent | 9be2353fac89729b839df3d0538b607f3fc1aa87 (diff) | |
parent | 89647a305f882cde0e87b0136ad9a1b6d3bd4fbd (diff) | |
download | rails-7eb596cddd75b379ca2ca25955b0bd2af77a89bc.tar.gz rails-7eb596cddd75b379ca2ca25955b0bd2af77a89bc.tar.bz2 rails-7eb596cddd75b379ca2ca25955b0bd2af77a89bc.zip |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/lib/action_view/base.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 36c49d9c91..66a5d59857 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -9,8 +9,8 @@ require 'active_support/core_ext/module/deprecation' module ActionView #:nodoc: # = Action View Base # - # Action View templates can be written in several ways. If the template file has a <tt>.erb</tt> (or <tt>.rhtml</tt>) extension then it uses a mixture of ERb - # (included in Ruby) and HTML. If the template file has a <tt>.builder</tt> (or <tt>.rxml</tt>) extension then Jim Weirich's Builder::XmlMarkup library is used. + # Action View templates can be written in several ways. If the template file has a <tt>.erb</tt> extension then it uses a mixture of ERb + # (included in Ruby) and HTML. If the template file has a <tt>.builder</tt> extension then Jim Weirich's Builder::XmlMarkup library is used. # # == ERB # @@ -94,10 +94,10 @@ module ActionView #:nodoc: # # Any method with a block will be treated as an XML markup tag with nested markup in the block. For example, the following: # - # xml.div { + # xml.div do # xml.h1(@person.name) # xml.p(@person.bio) - # } + # end # # would produce something like: # |