diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-15 07:13:47 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-15 07:13:47 +0000 |
commit | f173b876f6a55a4b9cbbf7c3535cc7c3341b7af4 (patch) | |
tree | 31e8a236d86de4d898e9215de59ceab9cf638474 | |
parent | 94715a868a8ea45ec23cbda1ab76e068d8d362ec (diff) |
merge revision(s) 47850: [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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | dir.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Wed Oct 15 16:13:28 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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 16:12:11 2014 Rei Odaira <Rei.Odaira@gmail.com> * configure.in: Fix typo. [Bug #9914] @@ -1751,11 +1751,9 @@ dir_globs(long argc, VALUE *argv, int flags) /* * 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>. * */ @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-10-15" -#define RUBY_PATCHLEVEL 581 +#define RUBY_PATCHLEVEL 582 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 10 |