aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/erb.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 591c1aa484..63e4973e7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 30 10:22:21 2014 Mark Lorenz <mlorenz@covermymeds.com>
+
+ * lib/erb.rb (result): [DOC] no longer accepts a Proc, as
+ Kernel.eval does not. [fix GH-619]
+
Fri May 30 07:25:46 2014 Tanaka Akira <akr@fsij.org>
* ext/-test-/dir: Dir#fileno implemented.
diff --git a/lib/erb.rb b/lib/erb.rb
index 5d32c47774..3c3cabe209 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -837,7 +837,7 @@ class ERB
# the results of that code. (See ERB::new for details on how this process
# can be affected by _safe_level_.)
#
- # _b_ accepts a Binding or Proc object which is used to set the context of
+ # _b_ accepts a Binding object which is used to set the context of
# code evaluation.
#
def result(b=new_toplevel)