usa	2014-09-03 13:42:39 +0900 (Wed, 03 Sep 2014)

  New Revision: 47369

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=47369

  Log:
    merge revision(s) 46241: [Backport #9875]
    
    * lib/erb.rb (result): [DOC] no longer accepts a Proc, as
      Kernel.eval does not.  [fix GH-619]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/erb.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 47368)
+++ ruby_2_0_0/ChangeLog	(revision 47369)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Sep  3 13:42:24 2014  Mark Lorenz  <mlorenz@c...>
+
+	* 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@f...>
 
 	* io.c (rb_io_autoclose_p): Don't raise on frozen IO.
Index: ruby_2_0_0/lib/erb.rb
===================================================================
--- ruby_2_0_0/lib/erb.rb	(revision 47368)
+++ ruby_2_0_0/lib/erb.rb	(revision 47369)
@@ -836,7 +836,7 @@ class ERB https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/erb.rb#L836
   # 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)
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 47368)
+++ ruby_2_0_0/version.h	(revision 47369)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r46241


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/