diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-26 04:26:16 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-26 04:26:16 +0000 |
| commit | f9a641fdd2d72f7fa7ffe5ad7f2f8e0cf6467af4 (patch) | |
| tree | f05adf8035804ac0d9e5841290a88e2dfc0c5464 /encoding.c | |
| parent | a29386aaabd32bc4018cdec2362f8e42d829b105 (diff) | |
merge revision(s) 54755: [Backport #12313]
* encoding.c: Fix return value of `Encoding::ISO8859_1.name`
[Bug #12313][ruby-core:75147][ci skip]
* ext/bigdecimal/bigdecimal.c: Fix code sample of `BigDecimal.new`
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/encoding.c b/encoding.c index 2aa3d7e2b3..1c6719c910 100644 --- a/encoding.c +++ b/encoding.c @@ -1691,7 +1691,7 @@ rb_enc_aliases(VALUE klass) * optionally, aliases: * * Encoding::ISO_8859_1.name - * #=> #<Encoding:ISO-8859-1> + * #=> "ISO-8859-1" * * Encoding::ISO_8859_1.names * #=> ["ISO-8859-1", "ISO8859-1"] |