diff --git a/ChangeLog b/ChangeLog index 35cb774e77..ee7d69a04f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Oct 15 16:13:28 2014 Nobuyoshi Nakada + + * 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 * configure.in: Fix typo. [Bug #9914] diff --git a/dir.c b/dir.c index dd44190335..7d61b61fdb 100644 --- a/dir.c +++ b/dir.c @@ -1751,11 +1751,9 @@ dir_globs(long argc, VALUE *argv, int flags) /* * call-seq: - * Dir[ array ] -> array * Dir[ string [, string ...] ] -> array * * Equivalent to calling - * Dir.glob(array,0) and * Dir.glob([string,...],0). * */ diff --git a/version.h b/version.h index c537551a53..86c9f7b3b6 100644 --- a/version.h +++ b/version.h @@ -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