From f9a641fdd2d72f7fa7ffe5ad7f2f8e0cf6467af4 Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 26 Apr 2016 04:26:16 +0000 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ encoding.c | 2 +- ext/bigdecimal/bigdecimal.c | 2 +- version.h | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 51ab17fa3f..dd1265d873 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Apr 26 13:25:25 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` + Tue Apr 26 13:22:45 2016 Rei Odaira * configure.in: add missing -lm for AIX. 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 - * #=> # + * #=> "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 aabdbc6833..11a7109635 100644 --- a/ext/bigdecimal/bigdecimal.c +++ b/ext/bigdecimal/bigdecimal.c @@ -1079,7 +1079,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) diff --git a/version.h b/version.h index dbe773a95a..bd5868eefb 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.5" #define RUBY_RELEASE_DATE "2016-04-26" -#define RUBY_PATCHLEVEL 317 +#define RUBY_PATCHLEVEL 318 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 4