nagachika	2016-11-21 16:56:47 +0900 (Mon, 21 Nov 2016)

  New Revision: 56858

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

  Log:
    merge revision(s) 53668: [Backport #12759]
    
    * lib/tempfile.rb (Tempfile#initialize): [DOC] the first parameter
      `basename` is optional and defaulted to an empty string since
      [GH-523].  [Fix GH-1225]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/lib/tempfile.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 56857)
+++ ruby_2_3/version.h	(revision 56858)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.3"
-#define RUBY_RELEASE_DATE "2016-11-19"
-#define RUBY_PATCHLEVEL 221
+#define RUBY_RELEASE_DATE "2016-11-21"
+#define RUBY_PATCHLEVEL 222
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 19
+#define RUBY_RELEASE_DAY 21
 
 #include "ruby/version.h"
 
Index: ruby_2_3/lib/tempfile.rb
===================================================================
--- ruby_2_3/lib/tempfile.rb	(revision 56857)
+++ ruby_2_3/lib/tempfile.rb	(revision 56858)
@@ -80,7 +80,7 @@ require 'tmpdir' https://github.com/ruby/ruby/blob/trunk/ruby_2_3/lib/tempfile.rb#L80
 # mutex.
 class Tempfile < DelegateClass(File)
   # call-seq:
-  #    new(basename, [tmpdir = Dir.tmpdir], [options])
+  #    new(basename = "", [tmpdir = Dir.tmpdir], [options])
   #
   # Creates a temporary file with permissions 0600 (= only readable and
   # writable by the owner) and opens it with mode "w+".
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 56857)
+++ ruby_2_3/ChangeLog	(revision 56858)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Mon Nov 21 16:55:15 2016  boshan  <boshan@s...>
+
+	* lib/tempfile.rb (Tempfile#initialize): [DOC] the first parameter
+	  `basename` is optional and defaulted to an empty string since
+	  [GH-523].  [Fix GH-1225]
+
 Sat Nov 19 14:06:07 2016  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* iseq.c (proc_dup): don't duplicate sym_procs.  [Fix GH-1479]

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r53668


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