nagachika	2016-06-14 03:49:40 +0900 (Tue, 14 Jun 2016)

  New Revision: 55405

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

  Log:
    merge revision(s) 55120: [Backport #12413]
    
    * dir.c (dir_close): update RDoc for 2.3 #close change
      [ruby-core:75679] [Bug #12413]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/dir.c
    branches/ruby_2_3/version.h
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 55404)
+++ ruby_2_3/ChangeLog	(revision 55405)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Tue Jun 14 03:49:28 2016  Eric Wong  <e@8...>
+
+	* dir.c (dir_close): update RDoc for 2.3 #close change
+	  [ruby-core:75679] [Bug #12413]
+
 Tue Jun 14 03:47:29 2016  Eric Wong  <e@8...>
 
 	* proc.c: fix RDoc of Proc#===/call/yield/[]
Index: ruby_2_3/dir.c
===================================================================
--- ruby_2_3/dir.c	(revision 55404)
+++ ruby_2_3/dir.c	(revision 55405)
@@ -885,8 +885,8 @@ dir_rewind(VALUE dir) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/dir.c#L885
  *  call-seq:
  *     dir.close -> nil
  *
- *  Closes the directory stream. Any further attempts to access
- *  <em>dir</em> will raise an <code>IOError</code>.
+ *  Closes the directory stream.
+ *  Calling this method on closed Dir object is ignored since Ruby 2.3.
  *
  *     d = Dir.new("testdir")
  *     d.close   #=> nil
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 55404)
+++ ruby_2_3/version.h	(revision 55405)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.2"
 #define RUBY_RELEASE_DATE "2016-06-14"
-#define RUBY_PATCHLEVEL 129
+#define RUBY_PATCHLEVEL 130
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 6

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


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