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

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index d6b1b9de42..3814bd9481 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 11 23:55:32 2014  Mark Lorenz  <mlorenz@covermymeds.com>
+
+	* lib/erb.rb (result): [DOC] no longer accepts a Proc, as
+	  Kernel.eval does not.  [fix GH-619]
+
 Mon Aug 11 23:38:20 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 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)
diff --git a/version.h b/version.h
index a2a9a0d960..7f5b320aea 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-08-11"
-#define RUBY_PATCHLEVEL 199
+#define RUBY_PATCHLEVEL 200
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 8