merge revision(s) 40301:

* dir.c (File.fnmatch): fix typo in documentation

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-04-15 14:09:18 +00:00
parent 8a28816625
commit 7514d35dc7
2 changed files with 2 additions and 2 deletions

2
dir.c
View file

@ -1994,7 +1994,7 @@ fnmatch_brace(const char *pattern, VALUE val, void *enc)
* *
* File.fnmatch('\?', '?') #=> true # escaped wildcard becomes ordinary * File.fnmatch('\?', '?') #=> true # escaped wildcard becomes ordinary
* File.fnmatch('\a', 'a') #=> true # escaped ordinary remains 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('[\?]', '?') #=> true # can escape inside bracket expression
* *
* File.fnmatch('*', '.profile') #=> false # wildcard doesn't match leading * File.fnmatch('*', '.profile') #=> false # wildcard doesn't match leading

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-04-15" #define RUBY_RELEASE_DATE "2013-04-15"
#define RUBY_PATCHLEVEL 135 #define RUBY_PATCHLEVEL 136
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 4 #define RUBY_RELEASE_MONTH 4