diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-07-03 06:00:42 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-07-03 06:00:42 +0000 |
commit | c6697027380ba29ae1475134f39c3fd63bdd225f (patch) | |
tree | ee8d385ac8e1f135ebffe1a211fbaf50de7d32bd | |
parent | 854db4e8654717b86d3f455d6e874cd5ad6fd39d (diff) |
merge revision(s) 46481: [Backport #9966]
* encoding.c (enc_find): [DOC] never accepted a symbol.
[ruby-dev:48308] [Bug #9966]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@46670 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | encoding.c | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Thu Jul 3 15:00:35 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * encoding.c (enc_find): [DOC] never accepted a symbol. + [ruby-dev:48308] [Bug #9966] + Thu Jul 3 13:23:31 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * thread_pthread.c (ruby_init_stack, ruby_stack_overflowed_p): diff --git a/encoding.c b/encoding.c index 26a87913dc..788e9837c5 100644 --- a/encoding.c +++ b/encoding.c @@ -1066,13 +1066,11 @@ enc_list(VALUE klass) /* * call-seq: * Encoding.find(string) -> enc - * Encoding.find(symbol) -> enc * * Search the encoding with specified <i>name</i>. - * <i>name</i> should be a string or symbol. + * <i>name</i> should be a string. * * Encoding.find("US-ASCII") #=> #<Encoding:US-ASCII> - * Encoding.find(:Shift_JIS) #=> #<Encoding:Shift_JIS> * * Names which this method accept are encoding names and aliases * including following special aliases @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-07-03" -#define RUBY_PATCHLEVEL 512 +#define RUBY_PATCHLEVEL 513 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 7 |