nagachika	2014-10-15 23:10:21 +0900 (Wed, 15 Oct 2014)

  New Revision: 47946

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

  Log:
    merge revision(s) r47850: [Backport #10294]
    
    * dir.c (dir_s_aref): fix rdoc.  `Dir.glob` allows an array but
      `Dir[]` not.  the former accepts an optional parameter `flags`,
      while the latter accepts arbitrary number of arguments but no
      `flags`.  [ruby-core:65265] [Bug #10294]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/dir.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47945)
+++ ruby_2_1/ChangeLog	(revision 47946)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Oct 15 23:10:07 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* dir.c (dir_s_aref): fix rdoc.  `Dir.glob` allows an array but
+	  `Dir[]` not.  the former accepts an optional parameter `flags`,
+	  while the latter accepts arbitrary number of arguments but no
+	  `flags`.  [ruby-core:65265] [Bug #10294]
+
 Wed Oct 15 23:08:02 2014  Rei Odaira  <Rei.Odaira@g...>
 
 	* configure.in: Fix typo. [Bug #9914]
Index: ruby_2_1/dir.c
===================================================================
--- ruby_2_1/dir.c	(revision 47945)
+++ ruby_2_1/dir.c	(revision 47946)
@@ -1784,11 +1784,9 @@ dir_globs(long argc, const VALUE *argv, https://github.com/ruby/ruby/blob/trunk/ruby_2_1/dir.c#L1784
 
 /*
  *  call-seq:
- *     Dir[ array ]                 -> array
  *     Dir[ string [, string ...] ] -> array
  *
  *  Equivalent to calling
- *  <code>Dir.glob(</code><i>array,</i><code>0)</code> and
  *  <code>Dir.glob([</code><i>string,...</i><code>],0)</code>.
  *
  */
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47945)
+++ ruby_2_1/version.h	(revision 47946)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.4"
 #define RUBY_RELEASE_DATE "2014-10-15"
-#define RUBY_PATCHLEVEL 249
+#define RUBY_PATCHLEVEL 250
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 10

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r47850


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