From 0e382a3dd8d72426d50c9cd77fc80362e05efc52 Mon Sep 17 00:00:00 2001 From: hsbt Date: Mon, 25 Apr 2016 02:17:54 +0000 Subject: * 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/trunk@54755 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ encoding.c | 2 +- ext/bigdecimal/bigdecimal.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09d9628eb7..97bea7b069 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Apr 25 11:17:50 2016 Marcus Stollsteimer + + * 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` + Sun Apr 24 23:29:16 2016 Rei Odaira * configure.in: add missing -lm for AIX. diff --git a/encoding.c b/encoding.c index 948b1781ac..88f31e157b 100644 --- a/encoding.c +++ b/encoding.c @@ -1718,7 +1718,7 @@ rb_enc_aliases(VALUE klass) * optionally, aliases: * * Encoding::ISO_8859_1.name - * #=> # + * #=> "ISO-8859-1" * * Encoding::ISO_8859_1.names * #=> ["ISO-8859-1", "ISO8859-1"] diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c index 32fbe684b2..9125e6b585 100644 --- a/ext/bigdecimal/bigdecimal.c +++ b/ext/bigdecimal/bigdecimal.c @@ -1103,7 +1103,7 @@ BigDecimal_comp(VALUE self, VALUE r) * * Values may be coerced to perform the comparison: * - * BigDecimal.new('1.0') == 1.0 -> true + * BigDecimal.new('1.0') == 1.0 #=> true */ static VALUE BigDecimal_eq(VALUE self, VALUE r) -- cgit v1.2.3