summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-11 14:55:58 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-11 14:55:58 +0000
commit5712fa573d0e8dd85b21c3bb668048f1985ccf89 (patch)
tree6fa22ad97d66bae0484c19864ea817bee1b24585 /lib
parent5a5ac31458c5fed5502e4a3dd7b05868ff9379fb (diff)
merge revision(s) r46241: [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_1@47141 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 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)