diff options
author | Xavier Noria <fxn@hashref.com> | 2011-04-23 01:11:24 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2011-04-23 01:11:24 +0200 |
commit | af1b48926f49226c934995c322ee017239158cf3 (patch) | |
tree | a496e072226dc4c16f70b5d74cb7eb800391fa82 /actionpack/lib/action_view/helpers/record_tag_helper.rb | |
parent | f7538808d466b756df15ac3f27ca08370f7a189c (diff) | |
parent | df70b9dfb23aa05ed7ae7955ff0fb7eec68de9a3 (diff) | |
download | rails-af1b48926f49226c934995c322ee017239158cf3.tar.gz rails-af1b48926f49226c934995c322ee017239158cf3.tar.bz2 rails-af1b48926f49226c934995c322ee017239158cf3.zip |
Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
Diffstat (limited to 'actionpack/lib/action_view/helpers/record_tag_helper.rb')
-rw-r--r-- | actionpack/lib/action_view/helpers/record_tag_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/helpers/record_tag_helper.rb b/actionpack/lib/action_view/helpers/record_tag_helper.rb index 4d300a1469..142a25f118 100644 --- a/actionpack/lib/action_view/helpers/record_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/record_tag_helper.rb @@ -10,7 +10,7 @@ module ActionView # relate to the specified Active Record object. Usage example: # # <%= div_for(@person, :class => "foo") do %> - # <%=h @person.name %> + # <%= @person.name %> # <% end %> # # produces: @@ -25,8 +25,8 @@ module ActionView # that relate to the specified Active Record object. For example: # # <%= content_tag_for(:tr, @person) do %> - # <td><%=h @person.first_name %></td> - # <td><%=h @person.last_name %></td> + # <td><%= @person.first_name %></td> + # <td><%= @person.last_name %></td> # <% end %> # # would produce the following HTML (assuming @person is an instance of |