archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 47850: [Backport #10294]

Browse source 
* 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
This commit is contained in:
usa 2014-10-15 07:13:47 +00:00
parent 94715a868a
commit f173b876f6
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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]

2
dir.c
View file

@ -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>.
*
*/

2
version.h
View file

@ -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