ruby-changes:28258
From: nagachika <ko1@a...>
Date: Mon, 15 Apr 2013 23:09:28 +0900 (JST)
Subject: [ruby-changes:28258] nagachika:r40310 (ruby_2_0_0): merge revision(s) 40301:
nagachika 2013-04-15 23:09:18 +0900 (Mon, 15 Apr 2013) New Revision: 40310 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40310 Log: merge revision(s) 40301: * dir.c (File.fnmatch): fix typo in documentation Modified directories: branches/ruby_2_0_0/ Modified files: branches/ruby_2_0_0/dir.c branches/ruby_2_0_0/version.h Index: ruby_2_0_0/dir.c =================================================================== --- ruby_2_0_0/dir.c (revision 40309) +++ ruby_2_0_0/dir.c (revision 40310) @@ -1994,7 +1994,7 @@ fnmatch_brace(const char *pattern, VALUE https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/dir.c#L1994 * * File.fnmatch('\?', '?') #=> true # escaped wildcard becomes ordinary * File.fnmatch('\a', 'a') #=> true # escaped ordinary remains ordinary - * File.fnmatch('\a', '\a', File::FNM_NOESCAPE) #=> true # FNM_NOESACPE makes '\' ordinary + * File.fnmatch('\a', '\a', File::FNM_NOESCAPE) #=> true # FNM_NOESCAPE makes '\' ordinary * File.fnmatch('[\?]', '?') #=> true # can escape inside bracket expression * * File.fnmatch('*', '.profile') #=> false # wildcard doesn't match leading Index: ruby_2_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 40309) +++ ruby_2_0_0/version.h (revision 40310) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1 #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-04-15" -#define RUBY_PATCHLEVEL 135 +#define RUBY_PATCHLEVEL 136 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 4 Property changes on: ruby_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r40301 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/