diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 85a87ade3d318..a3ff912f821f0 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -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.
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 2ee4227a6f754..5bcb01a2c76d6 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -11,7 +11,7 @@ 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>
@@ -19,12 +19,14 @@ class ActionViewError < StandardError #:nodoc:
   #     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
   #