Permalink
Browse files

Update documentation for erb trim syntax. #5651 [matt@mattmargolis.ne…

…t] Merge doc patches with stable.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4701 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
Marcel Molina
Marcel Molina committed Aug 7, 2006
1 parent 33bc251 commit fc1ded46e7e9665cc130681e3a9214295043225d
Showing with 11 additions and 4 deletions.
  1. +6 −1 actionpack/CHANGELOG
  2. +5 −3 actionpack/lib/action_view/base.rb
View
@@ -1,6 +1,11 @@
+*1.12.3* (June 28th, 2006)
+=======
+
+* Update documentation for erb trim syntax. #5651 [matt@mattmargolis.net]
+
* Short documentation to mention use of Mime::Type.register. #5710 [choonkeat@gmail.com]
-*1.12.3* (June 28th, 2006)
+* Pass :id => nil or :class => nil to error_messages_for to supress that html attribute. #3586 [olivier_ansaldi@yahoo.com, sebastien@goetzilla.info]
* Fix broken traverse_to_controller. We now:
Look for a _controller.rb file under RAILS_ROOT to load.
@@ -11,20 +11,22 @@ class ActionViewError < StandardError #:nodoc:
#
# = ERb
#
- # You trigger ERb by using embeddings such as <% %> and <%= %>. The difference is whether you want output or not. Consider the
+ # You trigger ERb by using embeddings such as <% %>, <% -%>, and <%= %>. The <%= %> tag set is used when you want output. Consider the
# following loop for names:
#
# <b>Names of all the people</b>
# <% for person in @people %>
# Name: <%= person.name %><br/>
# <% end %>
#
- # The loop is setup in regular embedding tags (<% %>) and the name is written using the output embedding tag (<%= %>). Note that this
+ # The loop is setup in regular embedding tags <% %> and the name is written using the output embedding tag <%= %>. Note that this
# is not just a usage suggestion. Regular output functions like print or puts won't work with ERb templates. So this would be wrong:
#
# Hi, Mr. <% puts "Frodo" %>
#
- # (If you absolutely must write from within a function, you can use the TextHelper#concat)
+ # If you absolutely must write from within a function, you can use the TextHelper#concat
+ #
+ # <%- and -%> suppress leading and trailing whitespace, including the trailing newline, and can be used interchangeably with <% and %>.
#
# == Using sub templates
#

0 comments on commit fc1ded4

Please sign in to comment.