summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-03 04:42:39 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-03 04:42:39 +0000
commitd7f49a9b066f511cdea83762b81d25fffd2f54c7 (patch)
tree3e9bd8057d09664955fd7191815c385b823a3a2a /lib
parent47264c4e1ffbc34fdd83b8bada241990433d9ee3 (diff)
merge revision(s) 46241: [Backport #9875]
* lib/erb.rb (result): [DOC] no longer accepts a Proc, as Kernel.eval does not. [fix GH-619] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47369 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/erb.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/erb.rb b/lib/erb.rb
index 51b128e3c5..eb7461bca5 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -836,7 +836,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)