summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/erb.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 99762a03e0..978ffd534f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 23 16:06:00 2012 Zachary Scott <zachary@zacharyscott.net>
+
+ * lib/erb.rb: Document ERB::new trim_mode '-' for lines ending in -%>
+ [ruby-core:51084] [Bug #7608]
+
Sun Dec 23 15:25:00 2012 Zachary Scott <zachary@zacharyscott.net>
* lib/irb/ruby-lex.rb: Add handling for %i and %I quoting to irb
diff --git a/lib/erb.rb b/lib/erb.rb
index 3ca939c5c8..a73041f69a 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -740,6 +740,7 @@ class ERB
# % enables Ruby code processing for lines beginning with %
# <> omit newline for lines starting with <% and ending in %>
# > omit newline for lines ending in %>
+ # - omit blank lines ending in -%>
#
# _eoutvar_ can be used to set the name of the variable ERB will build up
# its output in. This is useful when you need to run multiple ERB