diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-03 04:42:39 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-03 04:42:39 +0000 |
commit | d7f49a9b066f511cdea83762b81d25fffd2f54c7 (patch) | |
tree | 3e9bd8057d09664955fd7191815c385b823a3a2a | |
parent | 47264c4e1ffbc34fdd83b8bada241990433d9ee3 (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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/erb.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Wed Sep 3 13:42:24 2014 Mark Lorenz <mlorenz@covermymeds.com> + + * lib/erb.rb (result): [DOC] no longer accepts a Proc, as + Kernel.eval does not. [fix GH-619] + Wed Sep 3 13:23:29 2014 Tanaka Akira <akr@fsij.org> * io.c (rb_io_autoclose_p): Don't raise on frozen IO. 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) @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-09-03" -#define RUBY_PATCHLEVEL 547 +#define RUBY_PATCHLEVEL 548 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 9 |